pidgin: 9c559dfd: merge of '4a2d7c0b8570558cada900f60d7696...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 9c559dfd66ddba677db451ac8d37c885cd60da57
Ancestor: 4a2d7c0b8570558cada900f60d7696231954c231
Ancestor: e97dfd6e35de719fe7bffabef680c282f4702341
Author: khc at pidgin.im
Date: 2009-04-28T22:21:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9c559dfd66ddba677db451ac8d37c885cd60da57

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/dnssrv.c libpurple/dnssrv.h
        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 po/POTFILES.in

ChangeLog: 

merge of '4a2d7c0b8570558cada900f60d7696231954c231'
     and 'e97dfd6e35de719fe7bffabef680c282f4702341'