pidgin: f18b326f: merge of 'adc233c42c586b7fae877a688cd395...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: f18b326f044d292e0270f81cb0d67f094dd1cffb
Ancestor: adc233c42c586b7fae877a688cd39532eaca23a0
Ancestor: dff9129288f4ec49e17c74372f1f52405fdf94bf
Author: sadrul at pidgin.im
Date: 2008-06-01T21:36:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f18b326f044d292e0270f81cb0d67f094dd1cffb

Modified files:
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/xdata.c pidgin/gtkstatusbox.c

ChangeLog: 

merge of 'adc233c42c586b7fae877a688cd39532eaca23a0'
     and 'dff9129288f4ec49e17c74372f1f52405fdf94bf'