pidgin: 0ac2a2c7: merge of '5a35c52faacfbdaf503309fcdf1084...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 0ac2a2c73622e108ed3c2505b2af170462992e72
Ancestor: 5a35c52faacfbdaf503309fcdf10842cfd126c3f
Ancestor: ba6f2a0aa47088afe04b45a8eafd245fa72c9985
Author: datallah at pidgin.im
Date: 2009-01-02T07:42:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0ac2a2c73622e108ed3c2505b2af170462992e72

Modified files:
        AUTHORS COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        configure.ac doc/pidgin.1.in finch/finch.c finch/gntdebug.c
        libpurple/blist.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/myspace/myspace.c
        libpurple/protocols/myspace/session.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/oscar/odc.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/proxy.c
        libpurple/purple-url-handler libpurple/server.c
        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 po/ca.po po/ca at valencia.po po/fr.po

ChangeLog: 

merge of '5a35c52faacfbdaf503309fcdf10842cfd126c3f'
     and 'ba6f2a0aa47088afe04b45a8eafd245fa72c9985'