pidgin: ae2962f0: merge of '2008f1bd77717e12b27397825b76c1...

Wed Apr 29 01:25:39 EDT 2009

-----------------------------------------------------------------
Revision: ae2962f019013296b87740e608de5db314b90d8a
Ancestor: 2008f1bd77717e12b27397825b76c19de2fc7314
Ancestor: 55cc6e317f8651055c17a031024f0304271311cb
Author: darkrain42 at pidgin.im
Date: 2009-04-29T05:22:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ae2962f019013296b87740e608de5db314b90d8a

Modified files:
        ChangeLog.API libpurple/protocols/jabber/caps.c
        pidgin/gtkutils.c pidgin/gtkutils.h
        pidgin/plugins/ticker/ticker.c

ChangeLog: 

merge of '2008f1bd77717e12b27397825b76c19de2fc7314'
     and '55cc6e317f8651055c17a031024f0304271311cb'