pidgin: 1cb02c0e: merge of '605082e5e72e95dface3580569a073...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 1cb02c0ee6acec6884c42679e9e3203e3968b6f7
Ancestor: 605082e5e72e95dface3580569a0737cbd95e368
Ancestor: ad3059728a95ccf78fc978ee56938a5176224948
Author: qulogic at pidgin.im
Date: 2009-09-22T02:07:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1cb02c0ee6acec6884c42679e9e3203e3968b6f7

Modified files:
        ChangeLog ChangeLog.API doc/finch.1.in doc/pidgin.1.in
        finch/gntconv.c libpurple/account.c libpurple/account.h
        libpurple/dbus-server.c libpurple/media.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/oim.c
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/yahoo/libymsg.c
        libpurple/tests/test_jabber_jutil.c pidgin/gtkconv.c
        pidgin/gtkprefs.c pidgin/gtksound.c
        pidgin/win32/nsis/pidgin-installer.nsi po/de.po

ChangeLog: 

merge of '605082e5e72e95dface3580569a0737cbd95e368'
     and 'ad3059728a95ccf78fc978ee56938a5176224948'