pidgin: 2bf1b91e: merge of '3ba789b2288c2880c7a984b204ad54...

Fri Aug 15 22:46:12 EDT 2008

-----------------------------------------------------------------
Revision: 2bf1b91e196b9f481e1e0e63ba6aa28c9918ce6d
Ancestor: 3ba789b2288c2880c7a984b204ad5450055ba746
Ancestor: 7ed581bb09da510d3b35819f75829e5a7d585ed0
Author: datallah at pidgin.im
Date: 2008-08-16T02:39:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2bf1b91e196b9f481e1e0e63ba6aa28c9918ce6d

Modified files:
        NEWS pidgin/pixmaps/pidgin.ico
        pidgin/pixmaps/status/16/chat.png
        pidgin/pixmaps/status/16/scalable/chat.svg po/ChangeLog
        po/zh_TW.po

ChangeLog: 

merge of '3ba789b2288c2880c7a984b204ad5450055ba746'
     and '7ed581bb09da510d3b35819f75829e5a7d585ed0'