From: OCA git bot <OCA-git-bot@therp.nl>
Date: Mon, 24 Nov 2014 22:42:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'odoo/7.0' into 7.0
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=d128b409761835dd40ea5c0b0dbc51adeae3b097;p=odoo%2Fodoo.git

Merge remote-tracking branch 'odoo/7.0' into 7.0
---

d128b409761835dd40ea5c0b0dbc51adeae3b097