pidgin: b6887f13: merge of '150aa7010128787a82ee3eb64eec79...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: b6887f1394adde548d21425a58d267c9a29fe96c
Ancestor: 150aa7010128787a82ee3eb64eec7907e08235cc
Ancestor: 4639365ab1f20089553d2f1c4de4ce3c68e46d84
Author: darkrain42 at pidgin.im
Date: 2009-04-28T21:08:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b6887f1394adde548d21425a58d267c9a29fe96c

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/yahoo/yahoo.c libpurple/savedstatuses.c
        libpurple/server.c pidgin/gtkstatusbox.c po/POTFILES.in
        po/fi.po

ChangeLog: 

merge of '150aa7010128787a82ee3eb64eec7907e08235cc'
     and '4639365ab1f20089553d2f1c4de4ce3c68e46d84'