pidgin: cf52f515: merge of '1d360041ff45d34220efcda18bc92c...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: cf52f515f41f2668c92606c9ad852fb55460da9c
Ancestor: 1d360041ff45d34220efcda18bc92c70831b672f
Ancestor: 7bed935cd3432470394f51f4fe6e7f915aed9145
Author: darkrain42 at pidgin.im
Date: 2009-08-25T06:17:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cf52f515f41f2668c92606c9ad852fb55460da9c

Modified files:
        ChangeLog pidgin/gtkblist.c pidgin/gtkdialogs.c

ChangeLog: 

merge of '1d360041ff45d34220efcda18bc92c70831b672f'
     and '7bed935cd3432470394f51f4fe6e7f915aed9145'