From: Olivier Dony <odo@openerp.com>
Date: Sat, 2 Aug 2014 19:13:41 +0000 (+0200)
Subject: [MERGE] Forward-port 8.0 up to d706adb
X-Git-Tag: InsPy_master01~1^2~14
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=407cb2292471c1dd11380c503ac2cec6999816b8;p=odoo%2Fodoo.git

[MERGE] Forward-port 8.0 up to d706adb
---

407cb2292471c1dd11380c503ac2cec6999816b8