From: OCA git bot <OCA-git-bot@therp.nl>
Date: Wed, 22 Oct 2014 21:42:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'odoo/7.0' into 7.0
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=02e8d1a228e6dd301978246b2a756c5c33f747f3;p=odoo%2Fodoo.git

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

02e8d1a228e6dd301978246b2a756c5c33f747f3