pidgin: 81475e0c: merge of '1993306ee130a8c1c8eb294a1a05f8...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 81475e0c8a58feff71c5b6f773bb62f7a059fb73
Ancestor: 1993306ee130a8c1c8eb294a1a05f86aa098cb9f
Ancestor: e5c9e334137918bc4e82fa4a3305623348817152
Author: darkrain42 at pidgin.im
Date: 2010-04-14T19:58:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/81475e0c8a58feff71c5b6f773bb62f7a059fb73

Deleted entries:
        pidgin/eggtrayicon.c pidgin/eggtrayicon.h
Modified files:
        ChangeLog libpurple/protocols/simple/simple.c
        pidgin/Makefile.am pidgin/gtkconv.c pidgin/gtkutils.c
        pidgin/plugins/convcolors.c pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/gestures/stroke-draw.c
        pidgin/plugins/notify.c pidgin/plugins/pidginrc.c
        pidgin/plugins/themeedit.c pidgin/plugins/ticker/gtkticker.c
        pidgin/plugins/timestamp_format.c
        pidgin/plugins/xmppconsole.c po/POTFILES.in

ChangeLog: 

merge of '1993306ee130a8c1c8eb294a1a05f86aa098cb9f'
     and 'e5c9e334137918bc4e82fa4a3305623348817152'