pidgin: 80a55157: merge of '48b95d7d853b96052d4478dd475e60...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 80a55157fe9d56cc603ed9767040a9475847b3f3
Ancestor: 48b95d7d853b96052d4478dd475e60a97e7bda8b
Ancestor: d25c9ed783b024f75fac25f2320ddf5df6907c36
Author: malu at pidgin.im
Date: 2009-05-06T19:03:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/80a55157fe9d56cc603ed9767040a9475847b3f3

Modified files:
        ChangeLog libpurple/protocols/jabber/buddy.c
        libpurple/protocols/null/nullprpl.c pidgin/gtkstatusbox.c

ChangeLog: 

merge of '48b95d7d853b96052d4478dd475e60a97e7bda8b'
     and 'd25c9ed783b024f75fac25f2320ddf5df6907c36'