pidgin: 3033bb87: merge of '2ec56f8fe4fa8959fcac15d674b339...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 3033bb87676edf402a8cf741cc4b225d71b9649b
Ancestor: 2ec56f8fe4fa8959fcac15d674b339c112802a49
Ancestor: d221fa27ec6a8f0ab246208650e5c26658127ed4
Author: markdoliner at pidgin.im
Date: 2009-01-04T20:10:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3033bb87676edf402a8cf741cc4b225d71b9649b

Modified files:
        AUTHORS COPYRIGHT ChangeLog doc/pidgin.1.in finch/finch.c
        finch/gntdebug.c libpurple/core.c libpurple/network.c
        libpurple/prefs.c libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c libpurple/proxy.c
        libpurple/purple-url-handler libpurple/value.c
        libpurple/win32/libc_interface.c pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkdialogs.c po/de.po

ChangeLog: 

merge of '2ec56f8fe4fa8959fcac15d674b339c112802a49'
     and 'd221fa27ec6a8f0ab246208650e5c26658127ed4'