[MERGE]: Merged with trunk-addons
authoruco (Open ERP) <uco@tinyerp.com>
Tue, 31 Aug 2010 04:39:52 +0000 (10:09 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Tue, 31 Aug 2010 04:39:52 +0000 (10:09 +0530)
bzr revid: uco@tinyerp.com-20100831043952-0csxlq04a1hosd84

1  2 
addons/email_template/i18n/fr.po

Simple merge