From: Sébastien CHAZALLET <s.chazallet@gmail.com>
Date: Thu, 11 Dec 2014 10:43:25 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/odoo/odoo
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=HEAD;hp=-c;p=odoo%2Fodoo.git

Merge branch 'master' of https://github.com/odoo/odoo
---

fcd06145dda957a83e687fd033ff294c407da5f4