pidgin: c88a3075: merge of '73ff5eb429127d9a89484809ba81b5...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: c88a3075ebd15bf3cae940ac330c60c4853771ca
Ancestor: 73ff5eb429127d9a89484809ba81b50b6ed5c200
Ancestor: b06da0c40e8ffb855dcdb0047e94f337c62192a1
Author: evands at pidgin.im
Date: 2008-05-21T01:46:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c88a3075ebd15bf3cae940ac330c60c4853771ca

Added files:
        po/oc.po
Modified files:
        AUTHORS COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        NEWS autogen.sh configure.ac doc/finch.1.in finch/gntlog.c
        finch/gntlog.h finch/gntsound.c finch/libgnt/configure.ac
        finch/libgnt/gntbindable.c finch/libgnt/gntbindable.h
        finch/libgnt/gntbox.c finch/libgnt/gntentry.c
        finch/libgnt/gntmenu.c finch/libgnt/gnttree.c
        finch/libgnt/wms/irssi.c libpurple/Makefile.am
        libpurple/blist.c libpurple/blist.h libpurple/conversation.h
        libpurple/core.c libpurple/dbus-maybe.h
        libpurple/eventloop.h libpurple/network.c libpurple/plugin.c
        libpurple/prefs.h libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/buddy.h
        libpurple/protocols/bonjour/dns_sd_proxy.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/irc/cmds.c libpurple/protocols/irc/irc.c
        libpurple/protocols/irc/irc.h libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/win32/posix.uname.c
        libpurple/protocols/jabber/win32/utsname.h
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/httpconn.h
        libpurple/protocols/msn/msg.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/soap2.c
        libpurple/protocols/msnp9/cmdproc.c
        libpurple/protocols/msnp9/msg.c
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/msgcookie.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/oscar/peer.h
        libpurple/protocols/oscar/peer_proxy.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c libpurple/proxy.c
        libpurple/prpl.h libpurple/status.c
        libpurple/tests/check_libpurple.c libpurple/util.c
        libpurple/util.h pidgin/Makefile.mingw pidgin/gtkblist.c
        pidgin/gtkconn.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkeventloop.c pidgin/gtkimhtml.c pidgin/gtknotify.c
        pidgin/gtkplugin.c pidgin/gtkprefs.c pidgin/gtksound.c
        pidgin/gtkstatusbox.c pidgin/gtkthemes.h pidgin/gtkutils.c
        pidgin/pixmaps/logo.png pidgin/plugins/history.c
        pidgin/win32/nsis/translations/lithuanian.nsh pidgin.spec.in
        po/ChangeLog po/af.po po/be at latin.po po/ca.po po/cs.po
        po/de.po po/en_GB.po po/es.po po/fr.po po/he.po po/hu.po
        po/lt.po po/mk.po po/nl.po po/nn.po po/pt_BR.po po/ro.po
        po/ru.po po/sk.po po/sl.po po/sv.po po/zh_HK.po po/zh_TW.po

ChangeLog: 

merge of '73ff5eb429127d9a89484809ba81b50b6ed5c200'
     and 'b06da0c40e8ffb855dcdb0047e94f337c62192a1'