pidgin: f54abdc6: merge of '73c00fbbe95951b367f8bf73b5154c...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: f54abdc6f19646cdef101c3d397246e61083ca35
Ancestor: 73c00fbbe95951b367f8bf73b5154cd5a158529b
Ancestor: df7280158976d27e9eaf4a660e32a5af5a484578
Author: elb at pidgin.im
Date: 2009-03-01T20:56:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f54abdc6f19646cdef101c3d397246e61083ca35

Added files:
        libpurple/protocols/qq/buddy_memo.c
        libpurple/protocols/qq/buddy_memo.h po/km.po
        share/ca-certs/AOL_Member_CA.pem
        share/ca-certs/America_Online_Root_Certification_Authority_1.pem
Modified files:
        AUTHORS COPYRIGHT configure.ac libpurple/account.h
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/Makefile.mingw
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_list.h
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/im.c libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq.h
        libpurple/protocols/qq/qq_define.c
        libpurple/protocols/qq/qq_define.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_network.h
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/qq_trans.h libpurple/purple-remote
        pidgin/gtkdialogs.c pidgin/win32/nsis/pidgin-installer.nsi
        po/ChangeLog po/POTFILES.in po/af.po po/bn.po po/ca.po
        po/cs.po po/da.po po/de.po po/fr.po po/hu.po po/lt.po
        po/nb.po po/nn.po po/pa.po po/pt_BR.po po/ru.po po/sk.po
        po/sl.po po/sr.po po/sr at latin.po po/sv.po po/zh_HK.po
        po/zh_TW.po share/ca-certs/Makefile.am

ChangeLog: 

merge of '73c00fbbe95951b367f8bf73b5154cd5a158529b'
     and 'df7280158976d27e9eaf4a660e32a5af5a484578'