Merge remote-tracking branch 'odoo/master' into master-watchdog-fme
authorFabien Meghazi <fme@openerp.com>
Wed, 6 Aug 2014 13:27:26 +0000 (15:27 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 6 Aug 2014 13:27:26 +0000 (15:27 +0200)

Trivial merge