Merge remote-tracking branch 'odoo/master' into master-sass-in-bundles-fme
authorFabien Meghazi <fme@openerp.com>
Mon, 23 Jun 2014 08:00:34 +0000 (10:00 +0200)
committerFabien Meghazi <fme@openerp.com>
Mon, 23 Jun 2014 08:00:34 +0000 (10:00 +0200)

Trivial merge