pidgin: f11c46cb: merge of '34995dad46199f27666dc85ca2bef4...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: f11c46cb59c07c862176434fa78eaa1a8ca2c600
Ancestor: 34995dad46199f27666dc85ca2bef4e49470eaf8
Ancestor: 53303438f1a2d586d17f7efc61cba0bee2329a25
Author: qulogic at pidgin.im
Date: 2009-04-18T22:13:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f11c46cb59c07c862176434fa78eaa1a8ca2c600

Modified files:
        ChangeLog doc/TCL-HOWTO.dox
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/tcl/tcl_cmds.c
        libpurple/protocols/irc/msgs.c pidgin/gtkaccount.c
        pidgin/gtkdialogs.c pidgin/gtkdocklet.c pidgin/gtkimhtml.h
        pidgin/gtkimhtmltoolbar.h pidgin/gtkmenutray.h
        pidgin/gtkprefs.c pidgin/gtksmiley.c
        pidgin/gtksourceundomanager.h pidgin/gtkstatusbox.c
        pidgin/gtkutils.c pidgin/gtkutils.h pidgin/gtkwhiteboard.c
        pidgin/plugins/contact_priority.c
        pidgin/plugins/markerline.c
        pidgin/plugins/ticker/gtkticker.c
        pidgin/plugins/ticker/gtkticker.h
        pidgin/plugins/win32/transparency/win2ktrans.c

ChangeLog: 

merge of '34995dad46199f27666dc85ca2bef4e49470eaf8'
     and '53303438f1a2d586d17f7efc61cba0bee2329a25'