[MERGE] from Trunk
authorStephane Wirtel <stw@openerp.com>
Fri, 28 Feb 2014 16:13:38 +0000 (17:13 +0100)
committerStephane Wirtel <stw@openerp.com>
Fri, 28 Feb 2014 16:13:38 +0000 (17:13 +0100)
commit5918ad323e453e90a7a7b7c8c0971edea73dc8da
treedde1d38611fef3765db211ab6580ce15a5df393e
parent047d071a48630e3db2922d404d3d7f5395a88245
parent1d227c0b242009888a3749d41f0df9a1b6aaa5a1
[MERGE] from Trunk

bzr revid: stw@openerp.com-20140228161338-8yjlkwacuube7vir
openerp/http.py
openerp/tools/__init__.py
openerp/tools/config.py