pidgin: b9ed8b6d: merge of '3033bb87676edf402a8cf741cc4b22...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: b9ed8b6de6fcfea1e9a31808aa989aae2b2dca96
Ancestor: 3033bb87676edf402a8cf741cc4b225d71b9649b
Ancestor: 796422fbd6f4f5a30f7af2721f4f240da8d26d96
Author: markdoliner at pidgin.im
Date: 2009-01-04T20:13:06
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b9ed8b6de6fcfea1e9a31808aa989aae2b2dca96

Modified files:
        AUTHORS COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        NEWS configure.ac doc/pidgin.1.in finch/finch.c
        finch/gntdebug.c libpurple/blist.c libpurple/certificate.c
        libpurple/core.c libpurple/network.c libpurple/prefs.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/gg/buddylist.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/msn/error.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/soap.c
        libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/message.c
        libpurple/protocols/myspace/message.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/persist.h
        libpurple/protocols/myspace/session.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c libpurple/proxy.c
        libpurple/prpl.h libpurple/purple-url-handler
        libpurple/server.c libpurple/sslconn.c libpurple/status.h
        libpurple/util.c libpurple/value.c
        libpurple/win32/libc_interface.c libpurple/xmlnode.c
        pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkdialogs.c
        pidgin/gtkimhtml.c pidgin/win32/nsis/pidgin-installer.nsi
        po/ChangeLog po/af.po po/ar.po po/bn.po po/ca.po
        po/ca at valencia.po po/check_po.pl po/cs.po po/de.po po/el.po
        po/es.po po/fr.po po/gl.po po/hu.po po/nn.po po/pt_BR.po
        po/ro.po po/sk.po po/sl.po po/sq.po po/sr.po po/sr at latin.po
        po/sv.po po/zh_HK.po po/zh_TW.po

ChangeLog: 

merge of '3033bb87676edf402a8cf741cc4b225d71b9649b'
     and '796422fbd6f4f5a30f7af2721f4f240da8d26d96'