[MERGE] Forward-port of saas-5 up to 9ce08b7
authorOlivier Dony <odo@openerp.com>
Mon, 8 Sep 2014 14:53:11 +0000 (16:53 +0200)
committerOlivier Dony <odo@openerp.com>
Mon, 8 Sep 2014 14:54:10 +0000 (16:54 +0200)
commitd32d120a0ad5db2b58fd7eccbc60ea7b9eff8c18
tree5efcb2a25877a5d26e19d51c10ffeb3b8cadba2f
parent491162e653c939f9c14f21697ed72db1b9fe4017
parent9ce08b78ceeacb17024380ce5747338b247a9773
[MERGE] Forward-port of saas-5 up to 9ce08b7
addons/stock_account/stock_account.py
addons/website/models/ir_http.py
openerp/addons/base/ir/ir_http.py
openerp/http.py