Merge branch '8.0' of github.com:odoo/odoo into 8.0
authorFabien Pinckaers <fp@openerp.com>
Wed, 20 Aug 2014 10:21:58 +0000 (12:21 +0200)
committerFabien Pinckaers <fp@openerp.com>
Wed, 20 Aug 2014 10:21:58 +0000 (12:21 +0200)

Trivial merge