[MERGE] Forward-port saas-4 up to 847c7c8
authorOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 15:51:17 +0000 (17:51 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 15:51:50 +0000 (17:51 +0200)

Trivial merge