pidgin: 7281ad5b: merge of '09144f9b78a3f3256423cae57132a4...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 7281ad5ba8e68debd285e06dafebd991e980f3da
Ancestor: 09144f9b78a3f3256423cae57132a43098c065de
Ancestor: cc7bd8014e5aad2cfee2243816c1dbb53f7cd888
Author: darkrain42 at pidgin.im
Date: 2009-04-26T22:55:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7281ad5ba8e68debd285e06dafebd991e980f3da

Modified files:
        AUTHORS ChangeLog doc/pidgin.1.in
        libpurple/plugins/statenotify.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/presence.c pidgin/gtkdialogs.c
        pidgin/gtkstatusbox.c

ChangeLog: 

merge of '09144f9b78a3f3256423cae57132a43098c065de'
     and 'cc7bd8014e5aad2cfee2243816c1dbb53f7cd888'