pidgin: 07e1ad21: merge of '2dffa8ba1bee1171684d1f2eda5b5b...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 07e1ad21302e225cb2cf997b3bd1744424d725c4
Ancestor: 2dffa8ba1bee1171684d1f2eda5b5ba307787274
Ancestor: 7f87d4b5d3cc6e2b720d52df157f2e5d9ebe39ca
Author: sadrul at pidgin.im
Date: 2010-04-13T16:28:32
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/07e1ad21302e225cb2cf997b3bd1744424d725c4

Modified files:
        ChangeLog libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/gg/lib/events.c
        libpurple/protocols/gg/lib/libgadu.c
        libpurple/protocols/oscar/clientlogin.c pidgin/gtkconv.c
        pidgin/gtkutils.c

ChangeLog: 

merge of '2dffa8ba1bee1171684d1f2eda5b5ba307787274'
     and '7f87d4b5d3cc6e2b720d52df157f2e5d9ebe39ca'