[MERGE]: merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
authorRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Fri, 15 Apr 2011 04:40:37 +0000 (10:10 +0530)
committerRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Fri, 15 Apr 2011 04:40:37 +0000 (10:10 +0530)
commitcff7de9d501d6a70be5b9d81aa89dbc9188791ed
treeee96819f11d2bdcd04299394733bc4c690f895d1
parentf3d727379e4df5ee557ea7c0e6517203cb1b91f3
parentdd749822a7c3495f16d8c6cfed2eed411a10cc96
[MERGE]: merge with lp:~openerp-dev/openobject-addons/emails-framework-addons

bzr revid: rha@tinyerp.com-20110415044037-mo7fh592ojkjyhoq