pidgin: 5759afad: merge of '4af706c0918fd1eb930a0f2807a80a...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 5759afad6902f582116fc506bc06138c2a2793fb
Parent:   4af706c0918fd1eb930a0f2807a80a9f189b7b98
Parent:   b96fb413eb4d1392e8ae73177b72639f74da632c
Author:   datallah at pidgin.im
Date:     08/01/10 09:43:37
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5759afad6902f582116fc506bc06138c2a2793fb

Changelog: 

merge of '4af706c0918fd1eb930a0f2807a80a9f189b7b98'
     and 'b96fb413eb4d1392e8ae73177b72639f74da632c'

Changes against parent 4af706c0918fd1eb930a0f2807a80a9f189b7b98

  patched  ChangeLog

Changes against parent b96fb413eb4d1392e8ae73177b72639f74da632c

  patched  po/ca.po