pidgin.vv: 30886385: merge of '21bd048f68510f25c5c854a1c7e395...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 30886385eeb96954e2e7df9448f1b1b5cf5e31d1
Ancestor: 21bd048f68510f25c5c854a1c7e395e88f530503
Ancestor: 22ecf5b2d3d8874d498194695cb625a789c0754a
Author: maiku at soc.pidgin.im
Date: 2009-04-01T05:24:19
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/30886385eeb96954e2e7df9448f1b1b5cf5e31d1

Deleted entries:
        libpurple/protocols/toc/Makefile.am
        libpurple/protocols/toc/Makefile.mingw
        libpurple/protocols/toc/PROTOCOL
        libpurple/protocols/toc/toc.c
Modified files:
        ChangeLog ChangeLog.API configure.ac doc/account-signals.dox
        finch/gntblist.c finch/gntlog.c finch/gntplugin.c
        finch/gntroomlist.c libpurple/desktopitem.c libpurple/ntlm.c
        libpurple/plugins/mono/loader/debug-glue.c
        libpurple/plugins/mono/loader/mono.c
        libpurple/protocols/Makefile.am
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/irc/irc.c libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/novell/nmmessage.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc10/buddy.c
        libpurple/protocols/yahoo/yahoo_packet.c libpurple/prpl.h
        libpurple/tests/test_util.c pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkconvwin.h pidgin/gtkdialogs.c
        pidgin/gtkprefs.c pidgin/gtkroomlist.c pidgin/gtkutils.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.h pidgin/win32/untar.c
        po/POTFILES.in po/de.po

ChangeLog: 

merge of '21bd048f68510f25c5c854a1c7e395e88f530503'
     and '22ecf5b2d3d8874d498194695cb625a789c0754a'