im.pidgin.pidgin: a86cc370be80c0a0f0688ae2dec4f55775779fa1

Mon Feb 11 23:06:16 EST 2008

-----------------------------------------------------------------
Revision: a86cc370be80c0a0f0688ae2dec4f55775779fa1
Ancestor: 902c6324faa755dfbceafd40ebf88ef850d06c9b
Ancestor: a0772f771a053d37ada885e7b6826abb1091ed55
Author: sadrul at pidgin.im
Date: 2008-02-12T04:03:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a86cc370be80c0a0f0688ae2dec4f55775779fa1

Modified files:
        COPYRIGHT finch/gntconv.c libpurple/protocols/oscar/oscar.c
        pidgin/gtkconv.c pidgin/gtkconvwin.h pidgin/gtkprefs.c
        pidgin/pidginstock.c pidgin/pidginstock.h

ChangeLog: 

merge of '902c6324faa755dfbceafd40ebf88ef850d06c9b'
     and 'a0772f771a053d37ada885e7b6826abb1091ed55'