pidgin: a5e7a62d: merge of 'a9b83251335ed42daf54164bf8c512...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: a5e7a62db1d43009f4ff463b7fe67ff3a7275a78
Ancestor: a9b83251335ed42daf54164bf8c5120166f0e589
Ancestor: cd8c000c5205ad2bdbbc2c7de67b5f08b72e17c8
Author: rlaager at pidgin.im
Date: 2008-05-21T22:26:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a5e7a62db1d43009f4ff463b7fe67ff3a7275a78

Added files:
        po/oc.po
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac doc/finch.1.in doc/pidgin.1.in
        finch/gntaccount.c finch/gntlog.c finch/gntsound.c
        finch/libgnt/configure.ac finch/libgnt/gntbox.c
        finch/libgnt/gnttree.c finch/libgnt/wms/irssi.c
        libpurple/blist.c libpurple/core.c libpurple/dbus-maybe.h
        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/auth.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.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/purple-remote libpurple/purple-url-handler
        libpurple/status.c libpurple/tests/check_libpurple.c
        pidgin/Makefile.mingw pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkeventloop.c pidgin/gtkimhtml.c
        pidgin/gtkplugin.c pidgin/gtkprefs.c pidgin/gtksound.c
        pidgin/plugins/history.c
        pidgin/win32/nsis/translations/lithuanian.nsh pidgin.spec.in
        po/ChangeLog po/af.po po/be at latin.po po/cs.po po/de.po
        po/en_GB.po po/es.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 'a9b83251335ed42daf54164bf8c5120166f0e589'
     and 'cd8c000c5205ad2bdbbc2c7de67b5f08b72e17c8'