pidgin: fcc768ad: merge of '832388016fc893f5c5d8569130fe34...

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: fcc768ad62bc878c93d5b88b758d5e17251c9ebe
Ancestor: 832388016fc893f5c5d8569130fe34914c3c4cb0
Ancestor: adf65a0a97c9fc089e408fff1b80abe063adcf2f
Author: kstange at pidgin.im
Date: 2008-06-08T22:59:32
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fcc768ad62bc878c93d5b88b758d5e17251c9ebe

Modified files:
        ChangeLog libpurple/protocols/msn/soap2.c pidgin/gtkblist.c

ChangeLog: 

merge of '832388016fc893f5c5d8569130fe34914c3c4cb0'
     and 'adf65a0a97c9fc089e408fff1b80abe063adcf2f'