pidgin: acf47162: merge of '654444067285909ecd842c1a5b06f1...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: acf47162ca3864daf33d64a93e65604bf88ec07e
Ancestor: 654444067285909ecd842c1a5b06f16f773abe49
Ancestor: ad057b7532610edb11caffebfa98068b6239d787
Author: khc at pidgin.im
Date: 2009-05-03T17:59:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/acf47162ca3864daf33d64a93e65604bf88ec07e

Modified files:
        ChangeLog libpurple/mime.c libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/qq/qq_crypt.c pidgin/gtksavedstatuses.c
        po/ca.po

ChangeLog: 

merge of '654444067285909ecd842c1a5b06f16f773abe49'
     and 'ad057b7532610edb11caffebfa98068b6239d787'