[MERGE] Forward-port of saas-4 up to fa739ac
authorOlivier Dony <odo@openerp.com>
Wed, 25 Jun 2014 16:44:51 +0000 (18:44 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 25 Jun 2014 16:44:51 +0000 (18:44 +0200)
commit0d330ca25c6126aa1404ab0c3623b15cda151ab2
treef25fad1a18d8974b604d635223ddca081b61480a
parent45b2e4e1226d79a4afe515675535ffb27d2505a6
parentfa739ac8deccbcaa494b170fa238b6b60a0867f3
[MERGE] Forward-port of saas-4 up to fa739ac
addons/website/models/ir_http.py
addons/website_forum/controllers/main.py
openerp/http.py