pidgin: 3da4a61f: merge of '0bfcaf78ec07efb71812fff2c8b738...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 3da4a61feea56ff40dc5fdba355a1057c675a32d
Ancestor: 0bfcaf78ec07efb71812fff2c8b738b4532aac7f
Ancestor: 8a80f271858548f73cac50625660e87df1970bcc
Author: qulogic at pidgin.im
Date: 2009-02-05T06:25:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3da4a61feea56ff40dc5fdba355a1057c675a32d

Modified files:
        finch/finch.c finch/libgnt/gntkeys.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h
        libpurple/protocols/msn/msg.c
        libpurple/protocols/myspace/myspace.c

ChangeLog: 

merge of '0bfcaf78ec07efb71812fff2c8b738b4532aac7f'
     and '8a80f271858548f73cac50625660e87df1970bcc'