[MERGE] saas-4
authorSimon Lejeune <sle@openerp.com>
Wed, 23 Apr 2014 16:08:02 +0000 (18:08 +0200)
committerSimon Lejeune <sle@openerp.com>
Wed, 23 Apr 2014 16:08:02 +0000 (18:08 +0200)
bzr revid: sle@openerp.com-20140423160802-2kngtsa0zgkkegqx


Trivial merge