[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)
commit20cc18dcf6331afb72a566f0a52ae2f89639f3f4
tree923c585a79accc2b6a333356815cc9f51bae5170
parent2a94d1d8117847ef2cd1f904de3fe1b4c45779f6
parent847c7c836a731e4dcfba84698f928266fd957ace
[MERGE] Forward-port saas-4 up to 847c7c8