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

[MERGE] from saas-3

bzr revid: fva@openerp.com-20140210151007-saw8m1bqwnxek26x
bzr revid: fva@openerp.com-20140210155110-6obc985lc4rl3eyv
---

958764e7d318e05a199b4ba66a9fcc8ce407a3e1