[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)
bzr revid: al@openerp.com-20140317223549-gyhpe8dkzaw0qe7z

1  2 
openerp/http.py

diff --cc openerp/http.py
Simple merge