pidgin: 4c511003: merge of '5f1a220f63d8e85758a94a2ed57381...

Mon Apr 28 16:16:11 EDT 2008

-----------------------------------------------------------------
Revision: 4c5110037671f84e3e775214c32692b5b23c11e1
Ancestor: 5f1a220f63d8e85758a94a2ed57381dc91b07eda
Ancestor: d367c4b51bfd3fefedc0d0256bbcde2792770344
Author: evands at pidgin.im
Date: 2008-04-28T20:10:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4c5110037671f84e3e775214c32692b5b23c11e1

Modified files:
        ChangeLog autogen.sh libpurple/protocols/jabber/chat.c
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/misc.c
        libpurple/protocols/oscar/util.c pidgin/gtkconv.c

ChangeLog: 

merge of '5f1a220f63d8e85758a94a2ed57381dc91b07eda'
     and 'd367c4b51bfd3fefedc0d0256bbcde2792770344'