pidgin: 4b5d6b43: merge of '1cebb8e5585732c30dcfb31a6700dc...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 4b5d6b4371bfd8d48730643975d5ac68e10bc035
Ancestor: 1cebb8e5585732c30dcfb31a6700dcb78ae47b44
Ancestor: 9e66a21277bce5b8be225115269300903be335ea
Author: malu at pidgin.im
Date: 2009-12-01T21:36:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4b5d6b4371bfd8d48730643975d5ac68e10bc035

Modified files:
        ChangeLog libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/presence.c
        pidgin/plugins/disco/gtkdisco.c

ChangeLog: 

merge of '1cebb8e5585732c30dcfb31a6700dcb78ae47b44'
     and '9e66a21277bce5b8be225115269300903be335ea'