pidgin: 4d3b4738: merge of '136cd28c47ef3338b71082503a83a7...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 4d3b47389a469bb6ad059b99dbd53bd5f30f1d0e
Ancestor: 136cd28c47ef3338b71082503a83a7ecf465df78
Ancestor: ff8ea4e7234c104731c595807e704422ab97acaf
Author: darkrain42 at pidgin.im
Date: 2009-05-07T05:23:15
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4d3b47389a469bb6ad059b99dbd53bd5f30f1d0e

Modified files:
        ChangeLog libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/message.c pidgin/gtknotify.c
        po/ca.po

ChangeLog: 

merge of '136cd28c47ef3338b71082503a83a7ecf465df78'
     and 'ff8ea4e7234c104731c595807e704422ab97acaf'