pidgin: 55cc6e31: merge of '26ac092613aaf9cdf75dc965213469...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 55cc6e317f8651055c17a031024f0304271311cb
Ancestor: 26ac092613aaf9cdf75dc965213469a30135ab56
Ancestor: a18b8f63efe643713d40b3c0b2ef93c6775d79be
Author: sadrul at pidgin.im
Date: 2009-04-29T03:30:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/55cc6e317f8651055c17a031024f0304271311cb

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 ChangeLog.API libpurple/core.c
        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
        libpurple/protocols/oscar/family_locate.c pidgin/gtkutils.c
        pidgin/gtkutils.h pidgin/plugins/ticker/ticker.c
        po/POTFILES.in

ChangeLog: 

merge of '26ac092613aaf9cdf75dc965213469a30135ab56'
     and 'a18b8f63efe643713d40b3c0b2ef93c6775d79be'