From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Aug 2014 12:33:21 +0000 (+0200)
Subject: [MERGE] Forward-port 8.0 up to 494ecc6
X-Git-Tag: InsPy_master01~1^2~16
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=7d2533f5ec874b61e9167743021bafab5768fe93;p=odoo%2Fodoo.git

[MERGE] Forward-port 8.0 up to 494ecc6
---

7d2533f5ec874b61e9167743021bafab5768fe93