From: Frédéric van der Essen <fva@openerp.com>
Date: Mon, 24 Feb 2014 13:50:38 +0000 (+0100)
Subject: [MERGE] from upstream
X-Git-Tag: InsPy_master01~208^2~253^2~9^2~5
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=31cb4b8423e8d42083b342c923bd96b91e47465c;p=odoo%2Fodoo.git

[MERGE] from upstream

bzr revid: fva@openerp.com-20140224135038-3l6p5ebb5klmw8yr
---

31cb4b8423e8d42083b342c923bd96b91e47465c