pidgin.2.5.6: 9860ef67: merge of '65a7d608054498ee4f5752fe003c5e...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 9860ef67636e0627802f0dd127bcddb48a15a9ec
Ancestor: 65a7d608054498ee4f5752fe003c5e19dd47758d
Ancestor: f79b498a9d29cfc60c9b2db90fb0976afec6b756
Author: darkrain42 at pidgin.im
Date: 2009-05-14T21:34:38
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/9860ef67636e0627802f0dd127bcddb48a15a9ec

Modified files:
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/soap.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/qq/utils.c

ChangeLog: 

merge of '65a7d608054498ee4f5752fe003c5e19dd47758d'
     and 'f79b498a9d29cfc60c9b2db90fb0976afec6b756'