merge upstream
authorchm@openerp.com <>
Tue, 18 Mar 2014 16:06:53 +0000 (17:06 +0100)
committerchm@openerp.com <>
Tue, 18 Mar 2014 16:06:53 +0000 (17:06 +0100)
commitcb6af2b2f0e51d400ebeabbe53d8aa3fec4d325d
tree05e5b324b094625c0e36e8225b17d88d78d27f22
parentc0a97887b467f88c0198c39c1a41bc0396ffdc19
parent8f8ca3bd843a02bf44fe04e96365818a0b4468c8
merge upstream

bzr revid: chm@openerp.com-20140318160653-2l1t1ntzr1lpuwo9
openerp/http.py