merge upstream
authorChristophe Simonis <chs@openerp.com>
Thu, 27 Feb 2014 16:58:17 +0000 (17:58 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 27 Feb 2014 16:58:17 +0000 (17:58 +0100)
commit70f3ed09c5075d40dfc8af8bbd660d00b70b456f
treec63829457b377029d6c43625d7d6f31d104d8de4
parent8fec899f9b8eeeadc06c05adc03174a56ed6f13d
parent992975f2368166627dc0717009edc9e441cf0e45
merge upstream

bzr revid: chs@openerp.com-20140227165817-wdgdl4rbmtnnqudt
openerp/http.py