Merge remote-tracking branch 'odoo/saas-4' into saas-4-speakers-rim
authorRichard Mathot <rim@openerp.com>
Wed, 21 May 2014 15:11:58 +0000 (17:11 +0200)
committerRichard Mathot <rim@openerp.com>
Wed, 21 May 2014 15:11:58 +0000 (17:11 +0200)

Trivial merge