[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)
commit4bbcfddc13fb27295484c633ecab0bc12b9990c6
treed7035388eb16bc9e8122edda696e9a0f72d86997
parentd9fcc1604500b6df079cd40beba7c368be992372
parenta2e0cd3414a4450fd1b29eb88112de71eb1b94e6
[MERGE] from trunk

bzr revid: stw@openerp.com-20140312102948-1n3b2d1vqedzojzb
openerp/http.py
openerp/tools/config.py