From: Frédéric van der Essen <fva@openerp.com>
Date: Thu, 30 Jan 2014 13:31:21 +0000 (+0100)
Subject: [MERGE] from trunk
X-Git-Tag: InsPy_master01~628^2~2
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=7304a68c62531bade54d6cf9211419af582443fc;p=odoo%2Fodoo.git

[MERGE] from trunk

bzr revid: fva@openerp.com-20140130133121-4n75ma3xp5wn77du
---

7304a68c62531bade54d6cf9211419af582443fc