Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Mon, 24 Nov 2014 22:42:40 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Mon, 24 Nov 2014 22:42:40 +0000 (23:42 +0100)

Trivial merge