Merge remote-tracking branch 'odoo/master' into master-default-order-list-ged
authorGéry Debongnie <ged@odoo.com>
Mon, 16 Jun 2014 07:30:46 +0000 (09:30 +0200)
committerGéry Debongnie <ged@odoo.com>
Mon, 16 Jun 2014 07:30:46 +0000 (09:30 +0200)

Trivial merge