Revision 4b0d83cad4c8cbe59117f154bdeaec2377754ca8

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 4b0d83cad4c8cbe59117f154bdeaec2377754ca8
Ancestor: cb0bfe51682f8257f029d2dd61731a5ede123ba7
Ancestor: fe54b4edcc5b8faa419ae3abc56e9cc567633893
Author: datallah at pidgin.im
Date: 2007-08-03T13:28:23
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/oscar/oscar.c pidgin/gtkimhtmltoolbar.c

ChangeLog: 

merge of 'cb0bfe51682f8257f029d2dd61731a5ede123ba7'
     and 'fe54b4edcc5b8faa419ae3abc56e9cc567633893'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 4b0d83cad4c8cbe59117f154bdeaec2377754ca8