pidgin: ffe11b98: merge of '159777d1bbf9084c7e0f9e562bb47e...

Mon Jun 2 20:10:46 EDT 2008

-----------------------------------------------------------------
Revision: ffe11b98734ebc297dc36ad3e623bc945fdb5cc4
Ancestor: 159777d1bbf9084c7e0f9e562bb47e7ab3638da7
Ancestor: f2a934d118747fe777d8001932ddf481b872f948
Author: sadrul at pidgin.im
Date: 2008-06-03T00:10:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ffe11b98734ebc297dc36ad3e623bc945fdb5cc4

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/oscar/oscar.c pidgin/gtkstatusbox.c

ChangeLog: 

merge of '159777d1bbf9084c7e0f9e562bb47e7ab3638da7'
     and 'f2a934d118747fe777d8001932ddf481b872f948'