pidgin: 86a6f766: merge of '2e9b29f761a49d4b15531f9efc0c18...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 86a6f766f615d63eec848efd55c028f42bd42e16
Ancestor: 2e9b29f761a49d4b15531f9efc0c1824f50cfb0d
Ancestor: eb8c52d0929fb168ee42cc6e3a499067667eff8d
Author: nosnilmot at pidgin.im
Date: 2008-08-20T15:57:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/86a6f766f615d63eec848efd55c028f42bd42e16

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32
        doc/funniest_home_convos.txt
        libpurple/plugins/perl/Makefile.am
        libpurple/protocols/Makefile.mingw
        libpurple/protocols/oscar/oscar.c pidgin/gtkconv.c
        pidgin/pixmaps/tray/22/scalable/tray-away.svg
        pidgin/pixmaps/tray/22/scalable/tray-busy.svg
        pidgin/pixmaps/tray/22/scalable/tray-extended-away.svg
        pidgin/pixmaps/tray/22/scalable/tray-invisible.svg
        pidgin/pixmaps/tray/22/scalable/tray-message-new.svg
        pidgin/pixmaps/tray/22/scalable/tray-offline.svg
        pidgin/pixmaps/tray/22/scalable/tray-online.svg
        pidgin/pixmaps/tray/22/tray-away.png
        pidgin/pixmaps/tray/22/tray-busy.png
        pidgin/pixmaps/tray/22/tray-extended-away.png
        pidgin/pixmaps/tray/22/tray-invisible.png
        pidgin/pixmaps/tray/22/tray-new-im.png
        pidgin/pixmaps/tray/22/tray-offline.png
        pidgin/pixmaps/tray/22/tray-online.png po/nl.po

ChangeLog: 

merge of '2e9b29f761a49d4b15531f9efc0c1824f50cfb0d'
     and 'eb8c52d0929fb168ee42cc6e3a499067667eff8d'