pidgin: b758d151: merge of '6bf1ed8cefd6bb5b980baf7501bcf6...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: b758d151b349a80e72fdb429b04277f4ea1c8414
Ancestor: 6bf1ed8cefd6bb5b980baf7501bcf6936634bd8d
Ancestor: aff31bc617044d2074a9f5dc1c1b838061c496fd
Author: qulogic at pidgin.im
Date: 2009-07-13T05:40:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b758d151b349a80e72fdb429b04277f4ea1c8414

Modified files:
        ChangeLog ChangeLog.API configure.ac finch/gntconv.c
        libpurple/blist.c libpurple/blist.h
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/libymsg.c pidgin/gtkblist.c
        pidgin/gtkconv.c po/ChangeLog po/nn.po po/ru.po

ChangeLog: 

merge of '6bf1ed8cefd6bb5b980baf7501bcf6936634bd8d'
     and 'aff31bc617044d2074a9f5dc1c1b838061c496fd'