pidgin: 8d4081da: merge of '1256de56bf55d28698fb946db0dc7f...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 8d4081da0c186c04dc75d736d688bf4f20e52676
Ancestor: 1256de56bf55d28698fb946db0dc7fc965f4713b
Ancestor: 4fff88c1ced759af0eb5b037725dc81419b893e3
Author: qulogic at pidgin.im
Date: 2009-02-08T00:23:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8d4081da0c186c04dc75d736d688bf4f20e52676

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/jabber.c
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h
        libpurple/protocols/myspace/myspace.c libpurple/upnp.c
        po/de.po

ChangeLog: 

merge of '1256de56bf55d28698fb946db0dc7fc965f4713b'
     and '4fff88c1ced759af0eb5b037725dc81419b893e3'

Comments: 

I think the im.pidgin.cpw.darkrain42.xmpp.iq-handlers branch fixes this in a
better way.