cpw.qulogic.msn: ad436c79: merge of '67ca4287c39e084b96718b0e176857...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: ad436c79b67d443d3b340634dff8751e0db6a099
Ancestor: 67ca4287c39e084b96718b0e1768578954ac66a5
Ancestor: 7b988958a7a70ec7281d5843d8f04ec973a7ac1f
Author: qulogic at pidgin.im
Date: 2008-07-12T04:50:47
Branch: im.pidgin.cpw.qulogic.msn
URL: http://d.pidgin.im/viewmtn/revision/info/ad436c79b67d443d3b340634dff8751e0db6a099

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 finch/libgnt/gntbutton.c
        finch/libgnt/gntkeys.c libpurple/cmds.c libpurple/cmds.h
        libpurple/conversation.c libpurple/conversation.h
        libpurple/core.c libpurple/core.h
        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/msn/contact.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/userlist.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 '67ca4287c39e084b96718b0e1768578954ac66a5'
     and '7b988958a7a70ec7281d5843d8f04ec973a7ac1f'