pidgin.2.5.6: 145bf690: merge of '0d0a22730c3a0782d275ea2ad549bf...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: 145bf6906853ac546884ead407ca87566fbf63ba
Ancestor: 0d0a22730c3a0782d275ea2ad549bf3d93c70700
Ancestor: 1f7289ec41898b40159870ac726cf573812ce4e3
Author: elb at pidgin.im
Date: 2009-04-29T00:43:26
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/145bf6906853ac546884ead407ca87566fbf63ba

Modified files:
        ChangeLog libpurple/conversation.c libpurple/core.c
        libpurple/plugin.c libpurple/plugin.h
        libpurple/plugins/filectl.c libpurple/plugins/joinpart.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/session.h
        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/zephyr/zephyr.c pidgin/gtkconv.c

ChangeLog: 

merge of '0d0a22730c3a0782d275ea2ad549bf3d93c70700'
     and '1f7289ec41898b40159870ac726cf573812ce4e3'