pidgin: 2010b6cf: merge of 'd4111c3c390e4fbea55bfa213f353d...

[grim at pidgin.im]

-----------------------------------------------------------------
Revision: 2010b6cf9dfaf940d22f5593c63b22db86ee8844
Ancestor: d4111c3c390e4fbea55bfa213f353d6012f249d5
Ancestor: e6faf7cfc687458f9e3d8f8a88c339de80843fc5
Author: grim at pidgin.im
Date: 2009-07-08T00:50:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2010b6cf9dfaf940d22f5593c63b22db86ee8844

Modified files:
        pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkrequest.c
        pidgin/plugins/disco/xmppdisco.c

ChangeLog: 

merge of 'd4111c3c390e4fbea55bfa213f353d6012f249d5'
     and 'e6faf7cfc687458f9e3d8f8a88c339de80843fc5'