From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Aug 2014 21:10:29 +0000 (+0200)
Subject: [MERGE] Forward-port saas-3 up to fc92027
X-Git-Tag: 8.0.0~25^2~25^2~26
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=7273474d6591f2dc62423c92eb5ec661d597716c;p=odoo%2Fodoo.git

[MERGE] Forward-port saas-3 up to fc92027
---

7273474d6591f2dc62423c92eb5ec661d597716c