pidgin: 4a72c5fe: merge of '6e11e232a469bd7bd1f5c8dadebcfa...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 4a72c5feaab572105b4902609836cd509328aa6d
Ancestor: 6e11e232a469bd7bd1f5c8dadebcfa5809eb1cd1
Ancestor: e200d014d204272dbca9f1f87a8192b0c3e85ef3
Author: malu at pidgin.im
Date: 2010-02-01T21:28:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4a72c5feaab572105b4902609836cd509328aa6d

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

ChangeLog: 

merge of '6e11e232a469bd7bd1f5c8dadebcfa5809eb1cd1'
     and 'e200d014d204272dbca9f1f87a8192b0c3e85ef3'