diff ChangeLog @ 15961:9182d979ce58

merge of 'ee2473f71341ef0bbbc782c3f43a8842b164b543' and 'f40d11ee7f26ccab21583c3b07cd9e37a62c64e2'
author Luke Schierer <lschiere@pidgin.im>
date Wed, 28 Mar 2007 14:12:06 +0000
parents cc3c50816cc9
children 3da0548dc284
line wrap: on
line diff