soc.2008.masterpassword: 58a53c30: merge of '0258e37a638d8eae787d12695e0775...

[scrouaf at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 58a53c30e18e4c80ae9aba8d074c34a3947b9d52
Ancestor: 0258e37a638d8eae787d12695e07758d32d52219
Ancestor: 90a6d065106178c55b2ba651f408e82d589a55aa
Author: scrouaf at soc.pidgin.im
Date: 2008-07-11T22:26:47
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/58a53c30e18e4c80ae9aba8d074c34a3947b9d52

Added files:
        doc/cmd-signals.dox share/ca-certs/CAcert_Class3.pem
        share/ca-certs/CAcert_Root.pem
Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac
        finch/finch.c finch/gntconv.c libpurple/cmds.c
        libpurple/cmds.h libpurple/conversation.c
        libpurple/conversation.h libpurple/core.c libpurple/core.h
        libpurple/keyring.c libpurple/keyring.h
        libpurple/plugins/keyrings/internalkeyring.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_list.h
        libpurple/protocols/qq/char_conv.c
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/im.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/purple-url-handler pidgin/gtkmain.c po/POTFILES.in
        po/de.po share/ca-certs/Makefile.am

ChangeLog: 

merge of '0258e37a638d8eae787d12695e07758d32d52219'
     and '90a6d065106178c55b2ba651f408e82d589a55aa'