From: Alicia FLOREZ <alic.florez@gmail.com>
Date: Thu, 5 Jun 2014 12:10:20 +0000 (+0200)
Subject: Merge 'upstream/saas-4' into saas-4
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=refs%2Fheads%2Fsaas-4;p=odoo%2Fodoo.git

Merge 'upstream/saas-4' into saas-4
---

1a972db510f3faa153dec6f677307bb58b84d8bc