pidgin: aff31bc6: merge of '08cad9bb29fe8faaea25ef487d9d70...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: aff31bc617044d2074a9f5dc1c1b838061c496fd
Ancestor: 08cad9bb29fe8faaea25ef487d9d70c2f66fd6b5
Ancestor: cd91a95e17c080b804ab56a9024840a03432cb7e
Author: qulogic at pidgin.im
Date: 2009-07-13T05:28:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/aff31bc617044d2074a9f5dc1c1b838061c496fd

Modified files:
        ChangeLog libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/yahoo/libymsg.c pidgin/gtkconv.c

ChangeLog: 

merge of '08cad9bb29fe8faaea25ef487d9d70c2f66fd6b5'
     and 'cd91a95e17c080b804ab56a9024840a03432cb7e'