Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde
authorThibault Delavallée <tde@openerp.com>
Fri, 23 May 2014 10:40:39 +0000 (12:40 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 23 May 2014 10:40:39 +0000 (12:40 +0200)

Trivial merge