pidgin: 6c01f570: merge of '8e2be07d23144f93dd575524d8dac1...

[josep.puigdemont at gmail.com]

-----------------------------------------------------------------
Revision: 6c01f570946b5aa15076b2de30882e3812c7e889
Ancestor: 8e2be07d23144f93dd575524d8dac1986487d4cc
Ancestor: fefbbfc1bf183ed46a9573f6efea36050ff06d8e
Author: josep.puigdemont at gmail.com
Date: 2008-12-20T18:38:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6c01f570946b5aa15076b2de30882e3812c7e889

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 configure.ac
        po/ca.po

ChangeLog: 

merge of '8e2be07d23144f93dd575524d8dac1986487d4cc'
     and 'fefbbfc1bf183ed46a9573f6efea36050ff06d8e'