From: Christophe Simonis <chs@odoo.com>
Date: Tue, 15 Jul 2014 08:38:14 +0000 (+0200)
Subject: [MERGE] forward port of branch saas-3 up to 24484c8
X-Git-Tag: 8.0.0~25^2~75^2
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=de696f14f88ba54e79b7cba6b03c954fb3029f71;p=odoo%2Fodoo.git

[MERGE] forward port of branch saas-3 up to 24484c8
---

de696f14f88ba54e79b7cba6b03c954fb3029f71