pidgin: 9a8c2abf: merge of '6a70c2c1325aeb644bff8476f94c5a...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 9a8c2abfdbcf669fd21ec24f4aa474ac55a2ecb9
Ancestor: 6a70c2c1325aeb644bff8476f94c5a25f83044fb
Ancestor: d5a487de6cafd4f773a3cc1b9b08d6081771e9de
Author: malu at pidgin.im
Date: 2009-04-22T18:37:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9a8c2abfdbcf669fd21ec24f4aa474ac55a2ecb9

Modified files:
        AUTHORS ChangeLog doc/TCL-HOWTO.dox libpurple/plugin.h
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/tcl/tcl_cmds.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/jingle/content.c
        pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkdialogs.c
        pidgin/gtkdocklet.c pidgin/gtkimhtml.c pidgin/gtkimhtml.h
        pidgin/gtkimhtmltoolbar.c 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
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '6a70c2c1325aeb644bff8476f94c5a25f83044fb'
     and 'd5a487de6cafd4f773a3cc1b9b08d6081771e9de'