Revision 15f0eb2e525749743a7089f3d897fb1e8f4f91af

[charkins at pidgin.im]

-----------------------------------------------------------------
Revision: 15f0eb2e525749743a7089f3d897fb1e8f4f91af
Ancestor: c10371b38b40e6f540b80461f2ca6c931b0665aa
Ancestor: e1ea870d04aac126230cd2dad76d813069d437d3
Author: charkins at pidgin.im
Date: 2007-05-05T22:30:46
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog libpurple/internal.h pidgin/gtkdocklet.c
        pidgin/gtkmain.c

ChangeLog: 

merge of 'c10371b38b40e6f540b80461f2ca6c931b0665aa'
     and 'e1ea870d04aac126230cd2dad76d813069d437d3'


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