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

[MERGE] from upstream

bzr revid: fva@openerp.com-20140224160909-ezk3re38imtq2eo1
---

c1d5d858eb462a3d106dfb3f634895d16e261561