pidgin: 26ac0926: merge of 'ccb564416010a2752aa29c68143c9c...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 26ac092613aaf9cdf75dc965213469a30135ab56
Ancestor: ccb564416010a2752aa29c68143c9caf1aae054c
Ancestor: de03b3a75caf701d1d2bd1947e26d244ac9225fd
Author: darkrain42 at pidgin.im
Date: 2009-04-29T02:12:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/26ac092613aaf9cdf75dc965213469a30135ab56

Added files:
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/bosh.h
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/useravatar.h
Modified files:
        COPYRIGHT ChangeLog libpurple/conversation.c
        libpurple/core.c libpurple/dnssrv.c libpurple/dnssrv.h
        libpurple/idle.c libpurple/media.c libpurple/media.h
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/caps.h
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/qq.c
        libpurple/protocols/yahoo/yahoo.c libpurple/savedstatuses.c
        libpurple/server.c pidgin/gtkstatusbox.c po/POTFILES.in
        po/fi.po

ChangeLog: 

merge of 'ccb564416010a2752aa29c68143c9caf1aae054c'
     and 'de03b3a75caf701d1d2bd1947e26d244ac9225fd'