From: Frédéric van der Essen <fva@openerp.com>
Date: Mon, 3 Feb 2014 10:51:47 +0000 (+0100)
Subject: [MERGE] from trunk
X-Git-Tag: InsPy_master01~628^2~1
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=49d60fbaa44b5bff479e8586f6d7404219c93b28;p=odoo%2Fodoo.git

[MERGE] from trunk

bzr revid: fva@openerp.com-20140203105147-1rwz4ja8q5y4gqe8
---

49d60fbaa44b5bff479e8586f6d7404219c93b28