pidgin: 2ea80f9d: merge of 'de5074f5f3785a3e757b9ab4ed946a...

Sun Apr 18 17:48:53 EDT 2010

-----------------------------------------------------------------
Revision: 2ea80f9dd3cbd78edd4aa3dbe3b686684e251304
Ancestor: de5074f5f3785a3e757b9ab4ed946a01ddc69944
Ancestor: e8d0f65afa1697a579f40a67aa98f8a8fa4523f0
Author: qulogic at pidgin.im
Date: 2010-04-17T22:22:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2ea80f9dd3cbd78edd4aa3dbe3b686684e251304

Modified files:
        ChangeLog libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/switchboard.c libpurple/util.c
        pidgin/gtkimhtml.c pidgin/plugins/ticker/gtkticker.c

ChangeLog: 

merge of 'de5074f5f3785a3e757b9ab4ed946a01ddc69944'
     and 'e8d0f65afa1697a579f40a67aa98f8a8fa4523f0'