[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Mon, 17 Mar 2014 22:35:49 +0000 (23:35 +0100)
committerAntony Lesuisse <al@openerp.com>
Mon, 17 Mar 2014 22:35:49 +0000 (23:35 +0100)
commit0b7a673821eec564fa77b7de0f6d5c23a5988277
tree139c19ee22dd65e41a9552b5f1861f63bda1871e
parente6a5d82036a53ff3d4bdb8aed6f754e6c5b56a63
parent788708563133720c2833fdf0f67515940f6d4cd9
[MERGE] trunk

bzr revid: al@openerp.com-20140317223549-gyhpe8dkzaw0qe7z
openerp/http.py