pidgin: 7b1d6e64: merge of '8e5917b1daee611a3587cb11727a37...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 7b1d6e64a003d7c813ccd017489ecaed2b0e9201
Ancestor: 8e5917b1daee611a3587cb11727a37b8b0bc72a5
Ancestor: cd4ab1e30725817663f30bcb4d6cbe22879b271f
Author: khc at pidgin.im
Date: 2009-10-27T07:58:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7b1d6e64a003d7c813ccd017489ecaed2b0e9201

Modified files:
        ChangeLog libpurple/Makefile.am libpurple/account.c
        libpurple/cipher.c libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/roster.c libpurple/theme-loader.c
        pidgin/gtkblist.c pidgin/gtkimhtml.c pidgin/gtkstatusbox.c
        po/ca.po

ChangeLog: 

merge of '8e5917b1daee611a3587cb11727a37b8b0bc72a5'
     and 'cd4ab1e30725817663f30bcb4d6cbe22879b271f'