[MERGE] Forward-port of saas-3 up to 141e1b2
authorOlivier Dony <odo@openerp.com>
Wed, 25 Jun 2014 16:34:03 +0000 (18:34 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 25 Jun 2014 16:34:03 +0000 (18:34 +0200)
commit4d488408b23f1e9237c2de6bfff51379808caec8
tree168dd480df80fdb2c949fff1550361abbcdf6018
parent975a9b621ae4598577ae8cca7218555fb7a9cef9
parent141e1b2615ee992b111da7d7a2070f25b5de8318
[MERGE] Forward-port of saas-3 up to 141e1b2
addons/website/models/ir_http.py
openerp/http.py