[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Tue, 29 Jun 2010 05:30:51 +0000 (11:00 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Tue, 29 Jun 2010 05:30:51 +0000 (11:00 +0530)
commit9a686357a9b6edb65a86501a4543d6b88022f599
tree668fdacff827dd6eb0392dea0e95939c8ff0772d
parent680c1231bd5bc3e6b68a3929644b30d29173de57
parentaa8e5bd286cfa539225471c51962c24427804ffb
[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100629053051-tbmlaes9vivky5xn
addons/crm/wizard/crm_send_email.py
addons/document_ftp/wizard/ftp_configuration.py
addons/mrp/mrp.py