From: Frédéric van der Essen <fva@openerp.com>
Date: Wed, 26 Mar 2014 10:33:07 +0000 (+0100)
Subject: [MERGE] from trunk
X-Git-Tag: InsPy_master01~341^2~1
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=2378decc042b9c404441b52e26b55f700f065319;p=odoo%2Fodoo.git

[MERGE] from trunk

bzr revid: fva@openerp.com-20140326103307-lchlskkdweospgps
---

2378decc042b9c404441b52e26b55f700f065319