pidgin: 3bdf5aad: merge of '9d07d82a935ade0bf3a9a387a0c899...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 3bdf5aad1c3d02b04ea918d996f6db99ecb40778
Ancestor: 9d07d82a935ade0bf3a9a387a0c8998d552c7be9
Ancestor: dd58d6e08f6bf88e8bdd13e3c8d0b73cc73bbab3
Author: datallah at pidgin.im
Date: 2009-01-09T03:56:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3bdf5aad1c3d02b04ea918d996f6db99ecb40778

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        configure.ac doc/Makefile.am finch/libgnt/gntkeys.c
        finch/libgnt/gntmain.c finch/libgnt/gnttree.c
        finch/libgnt/gntwindow.c finch/libgnt/gntwm.c
        finch/libgnt/wms/irssi.c libpurple/core.c
        libpurple/dbus-server.c libpurple/dnsquery.c libpurple/ft.c
        libpurple/plugin.c
        libpurple/plugins/perl/common/PluginPref.xs
        libpurple/plugins/perl/common/Util.xs
        libpurple/plugins/perl/perl-handlers.c libpurple/prefs.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/qq/ChangeLog libpurple/protocols/qq/im.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/sametime/Makefile.am
        libpurple/protocols/sametime/Makefile.mingw
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c libpurple/proxy.c
        libpurple/win32/libc_interface.c pidgin/gtkaccount.c
        pidgin/gtkdialogs.c pidgin/gtkpounce.c pidgin/gtksmiley.c
        pidgin/plugins/notify.c
        pidgin/win32/nsis/translations/german.nsh po/ChangeLog
        po/bn.po po/ca.po po/ca at valencia.po po/cs.po po/de.po
        po/es.po po/fi.po po/fr.po po/hu.po po/nb.po po/nl.po
        po/pt_BR.po po/ro.po po/sk.po

ChangeLog: 

merge of '9d07d82a935ade0bf3a9a387a0c8998d552c7be9'
     and 'dd58d6e08f6bf88e8bdd13e3c8d0b73cc73bbab3'