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)
bzr revid: chs@openerp.com-20140227165817-wdgdl4rbmtnnqudt

1  2 
openerp/http.py

diff --cc openerp/http.py
Simple merge