pidgin: f3fc028d: merge of '455ee39cd9ae508a675deeaa3952b9...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: f3fc028d9b3beec4d7d987c7b04796f22b6f4bf6
Ancestor: 455ee39cd9ae508a675deeaa3952b91d404ca64d
Ancestor: 8ee76f2f5b656f5452cf284b76a5f8863d52d8e0
Author: darkrain42 at pidgin.im
Date: 2009-08-18T18:29:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f3fc028d9b3beec4d7d987c7b04796f22b6f4bf6

Modified files:
        pidgin/gtkblist.c pidgin/plugins/disco/Makefile.am

ChangeLog: 

merge of '455ee39cd9ae508a675deeaa3952b91d404ca64d'
     and '8ee76f2f5b656f5452cf284b76a5f8863d52d8e0'