pidgin: 605fc2c1: merge of '3bdf5aad1c3d02b04ea918d996f6db...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 605fc2c13ec364c27814f3ad22a721078fd5f970
Ancestor: 3bdf5aad1c3d02b04ea918d996f6db99ecb40778
Ancestor: d61c2fc82b19cd2629b498d903d7018d41a00108
Author: datallah at pidgin.im
Date: 2009-01-09T03:57:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/605fc2c13ec364c27814f3ad22a721078fd5f970

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/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 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 '3bdf5aad1c3d02b04ea918d996f6db99ecb40778'
     and 'd61c2fc82b19cd2629b498d903d7018d41a00108'