[MERGE] Forward-port of saas-4 up to 65b6b81
authorOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 18:55:53 +0000 (20:55 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 18:55:53 +0000 (20:55 +0200)
commit6189c44d9799c615145b4d3a2f92d6d6c977792c
treea7ac4c01595959688d990c1ddcef6710988a3b1a
parent20cc18dcf6331afb72a566f0a52ae2f89639f3f4
parent65b6b81d2c94312f29fb46eedcf16853cf3dacc0
[MERGE] Forward-port of saas-4 up to 65b6b81