From: Denis Ledoux <dle@odoo.com>
Date: Wed, 5 Nov 2014 09:29:27 +0000 (+0100)
Subject: [MERGE] forward port of branch 7.0 up to 9a37e5a
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=c11451c7e818f28b3eb6c86e9e23832c96055819;p=odoo%2Fodoo.git

[MERGE] forward port of branch 7.0 up to 9a37e5a
---

c11451c7e818f28b3eb6c86e9e23832c96055819