[MERGE] from trunk
authorStephane Wirtel <stw@openerp.com>
Wed, 12 Mar 2014 10:29:48 +0000 (11:29 +0100)
committerStephane Wirtel <stw@openerp.com>
Wed, 12 Mar 2014 10:29:48 +0000 (11:29 +0100)
bzr revid: stw@openerp.com-20140312102948-1n3b2d1vqedzojzb

1  2 
openerp/http.py
openerp/tools/config.py

diff --cc openerp/http.py
Simple merge
Simple merge