pidgin: ca41f163: merge of '21e96c2781026be159ef9d16095e34...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: ca41f163a139123ff8ac7752424944338396520f
Ancestor: 21e96c2781026be159ef9d16095e34151c421fbc
Ancestor: 8ac7bfcea95abcd7f1d1cc3ca92c3453c4704fb3
Author: evands at pidgin.im
Date: 2009-02-25T21:56:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ca41f163a139123ff8ac7752424944338396520f

Added files:
        libpurple/protocols/qq/buddy_memo.c
        libpurple/protocols/qq/buddy_memo.h
Modified files:
        COPYRIGHT ChangeLog libpurple/account.h libpurple/plugin.h
        libpurple/plugins/ssl/ssl-gnutls.c libpurple/prefs.h
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/state.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
        libpurple/sslconn.h libpurple/version.h.in pidgin/gtkblist.h
        po/ChangeLog 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/ru.po
        po/sk.po po/sl.po po/sr.po po/sr at latin.po

ChangeLog: 

merge of '21e96c2781026be159ef9d16095e34151c421fbc'
     and '8ac7bfcea95abcd7f1d1cc3ca92c3453c4704fb3'