pidgin: 50551682: merge of '0ef963ce959c8061467d33c5a24de2...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 505516826b01aed6390e0c2aa38706c0e2da163e
Ancestor: 0ef963ce959c8061467d33c5a24de263afef2053
Ancestor: 65354086b2158121a40a5e1b469992d2a2ee63d2
Author: qulogic at pidgin.im
Date: 2009-06-06T23:14:17
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/505516826b01aed6390e0c2aa38706c0e2da163e

Modified files:
        ChangeLog ChangeLog.API libpurple/protocols/yahoo/yahoo.c
        libpurple/theme.c pidgin/gtkdialogs.c pidgin/pidginstock.c
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/xmppdisco.c pidgin/plugins/pidginrc.c
        pidgin/plugins/themeedit-icon.h pidgin/plugins/xmppconsole.c
        po/ca.po

ChangeLog: 

merge of '0ef963ce959c8061467d33c5a24de263afef2053'
     and '65354086b2158121a40a5e1b469992d2a2ee63d2'