[MERGE] from trunk
authorchm@openerp.com <>
Tue, 25 Mar 2014 08:49:53 +0000 (09:49 +0100)
committerchm@openerp.com <>
Tue, 25 Mar 2014 08:49:53 +0000 (09:49 +0100)
commit105c26e623d016b3d50a40e1055fc2b4073f2ec6
tree51311cd546aa73b2b48e8689cd80236115f44bb5
parentea901ebb1de354f5bccc5cbcfb7ef478f5fa99eb
parentad7acd37460c1b7ee416fa703b49d096766f4835
[MERGE] from trunk

bzr revid: chm@openerp.com-20140324082422-38x5kcnh830200wl
bzr revid: chm@openerp.com-20140325084953-s3sl2f1un7z08wxy
openerp/http.py