Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
authorGéry Debongnie <ged@odoo.com>
Wed, 28 May 2014 11:18:07 +0000 (13:18 +0200)
committerGéry Debongnie <ged@odoo.com>
Wed, 28 May 2014 11:18:07 +0000 (13:18 +0200)

Trivial merge