pidgin: 96ef17b6: merge of 'c4a26372086186405c4635b2fbf448...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 96ef17b60f1a746c6c15c25092a3b3298d2c1dcf
Ancestor: c4a26372086186405c4635b2fbf448b8d089f863
Ancestor: c9659a3fecdd575434640e531c3eb61f90de6976
Author: qulogic at pidgin.im
Date: 2010-04-30T03:35:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/96ef17b60f1a746c6c15c25092a3b3298d2c1dcf

Modified files:
        ChangeLog.API libpurple/account.c libpurple/account.h
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/auth_scram.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/qq/qq.c libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
        pidgin/gtkrequest.c

ChangeLog: 

merge of 'c4a26372086186405c4635b2fbf448b8d089f863'
     and 'c9659a3fecdd575434640e531c3eb61f90de6976'