Revision e23473d400dac91247523147d7141cad1f568e66

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: e23473d400dac91247523147d7141cad1f568e66
Ancestor: b6c53eca73f8f22b0d8fafd412b2570c631455be
Ancestor: db850ab42d8f30eaba15fafaa3dc5ec1137141e7
Author: elb at pidgin.im
Date: 2007-08-27T17:22:16
Branch: im.pidgin.pidgin

Modified files:
        doc/funniest_home_convos.txt pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkimhtmltoolbar.c
        pidgin/gtkimhtmltoolbar.h pidgin/pidginstock.c
        pidgin/pidginstock.h

ChangeLog: 

merge of 'b6c53eca73f8f22b0d8fafd412b2570c631455be'
     and 'db850ab42d8f30eaba15fafaa3dc5ec1137141e7'


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