pidgin.vv: c2633115: merge of '6034e4df300b7da5e8fc3095e128f6...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: c26331159ab2eaaa663def5d6b5eae3a5a2b6d25
Ancestor: 6034e4df300b7da5e8fc3095e128f6215af903ab
Ancestor: 6f6a810b0411a1e2b7a1bba79dae2b02ea200d19
Author: maiku at soc.pidgin.im
Date: 2009-02-21T05:15:28
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/c26331159ab2eaaa663def5d6b5eae3a5a2b6d25

Modified files:
        COPYRIGHT ChangeLog Makefile.am finch/finch.c
        finch/libgnt/gntkeys.c finch/libgnt/gntwm.c
        finch/plugins/gntclipboard.c finch/plugins/gntgf.c
        finch/plugins/grouping.c finch/plugins/lastlog.c
        libpurple/account.h libpurple/media.c libpurple/media.h
        libpurple/mediamanager.c libpurple/mediamanager.h
        libpurple/plugin.h libpurple/plugins/autoaccept.c
        libpurple/plugins/codeinline.c libpurple/plugins/newline.c
        libpurple/plugins/offlinemsg.c
        libpurple/plugins/perl/common/Server.xs libpurple/prefs.h
        libpurple/privacy.c
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/iceudp.c
        libpurple/protocols/jabber/jingle/iceudp.h
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msg.c
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/nexus.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/transaction.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/simple/simple.c libpurple/proxy.c
        libpurple/prpl.c libpurple/prpl.h libpurple/savedstatuses.c
        libpurple/sslconn.h libpurple/upnp.c libpurple/util.h
        libpurple/version.h.in pidgin/gtkblist.c pidgin/gtkblist.h
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkdocklet.c
        pidgin/gtkmedia.c pidgin/gtkprefs.c pidgin/pidgintooltip.c
        pidgin/plugins/convcolors.c pidgin/plugins/markerline.c
        pidgin/plugins/pidgininc.c pidgin/plugins/timestamp.c
        pidgin/plugins/xmppconsole.c po/de.po

ChangeLog: 

merge of '6034e4df300b7da5e8fc3095e128f6215af903ab'
     and '6f6a810b0411a1e2b7a1bba79dae2b02ea200d19'