pidgin.2.5.6: 1f7289ec: merge of '175f0b579cc408c333dd4a10fa92ff...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: 1f7289ec41898b40159870ac726cf573812ce4e3
Ancestor: 175f0b579cc408c333dd4a10fa92ff9b56108ed9
Ancestor: 1fcba66fbd836c93985c0490b29a1cd899ae1542
Author: elb at pidgin.im
Date: 2009-04-28T21:14:11
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/1f7289ec41898b40159870ac726cf573812ce4e3

Modified files:
        ChangeLog finch/gntblist.c finch/gntnotify.c
        libpurple/conversation.c libpurple/core.c libpurple/plugin.c
        libpurple/plugin.h libpurple/plugins/filectl.c
        libpurple/plugins/joinpart.c libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msnp9/httpconn.c
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/transaction.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/zephyr/zephyr.c pidgin/gtkconv.c

ChangeLog: 

merge of '175f0b579cc408c333dd4a10fa92ff9b56108ed9'
     and '1fcba66fbd836c93985c0490b29a1cd899ae1542'