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

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

7d20f2cb7a919a70207c24e70e50c653b02648f0