pidgin: a13d4cf4: merge of '8222e69d26359ab1a478cc42d25834...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: a13d4cf459814135e90c2742ee21f605404005e3
Ancestor: 8222e69d26359ab1a478cc42d25834120aee713b
Ancestor: ee2ad24a7d051b291259bd2fc8ce8e57f24c0cbb
Author: darkrain42 at pidgin.im
Date: 2009-07-04T17:19:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a13d4cf459814135e90c2742ee21f605404005e3

Modified files:
        doc/connection-signals.dox libpurple/plugins/log_reader.c
        libpurple/plugins/offlinemsg.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/yahoo/yahoo.c libpurple/util.c
        pidgin/gtkcertmgr.c pidgin/gtkimhtml.c pidgin/gtkutils.c
        pidgin/plugins/musicmessaging/musicmessaging.c
        pidgin/plugins/sendbutton.c
        pidgin/plugins/win32/winprefs/winprefs.c po/ca.po po/de.po

ChangeLog: 

merge of '8222e69d26359ab1a478cc42d25834120aee713b'
     and 'ee2ad24a7d051b291259bd2fc8ce8e57f24c0cbb'