pidgin: 13fcee3e: merge of '4a72c5feaab572105b4902609836cd...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 13fcee3e431cd9e683fc75f1770f2a65f253a7d1
Ancestor: 4a72c5feaab572105b4902609836cd509328aa6d
Ancestor: 89ddd80c4cd11b79fbcb649bba819ecce526312c
Author: sadrul at pidgin.im
Date: 2010-02-01T21:51:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/13fcee3e431cd9e683fc75f1770f2a65f253a7d1

Modified files:
        ChangeLog libpurple/protocols/jabber/disco.c
        pidgin/gtkthemes.c

ChangeLog: 

merge of '4a72c5feaab572105b4902609836cd509328aa6d'
     and '89ddd80c4cd11b79fbcb649bba819ecce526312c'