From: Frédéric van der Essen <fva@openerp.com>
Date: Thu, 20 Mar 2014 13:40:17 +0000 (+0100)
Subject: [MERGE] from trunk
X-Git-Tag: InsPy_master01~341^2~9
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=559641390143fc3457f531aa44d795ce41f85d60;p=odoo%2Fodoo.git

[MERGE] from trunk

bzr revid: fva@openerp.com-20140320134017-wi6qdofziia3q12l
---

559641390143fc3457f531aa44d795ce41f85d60