pidgin: 1182d999: merge of '2abcbb9461812553614a4d11b0d48f...

Wed May 28 01:18:11 EDT 2008

-----------------------------------------------------------------
Revision: 1182d9990ec20b5330e5b932c92849461a325d7e
Ancestor: 2abcbb9461812553614a4d11b0d48f1a2eface59
Ancestor: 92093f7de4f345eebf236fdcdd5a11945c86c01f
Author: sadrul at pidgin.im
Date: 2008-05-28T05:12:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1182d9990ec20b5330e5b932c92849461a325d7e

Modified files:
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/oscar/oscar.c pidgin/gtkimhtml.c
        pidgin/gtkimhtml.h pidgin/gtkimhtmltoolbar.c

ChangeLog: 

merge of '2abcbb9461812553614a4d11b0d48f1a2eface59'
     and '92093f7de4f345eebf236fdcdd5a11945c86c01f'