[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Wed, 23 Apr 2014 12:38:08 +0000 (14:38 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 23 Apr 2014 12:38:08 +0000 (14:38 +0200)
commit8370d3f60e83f94cc158bdfd75fa8e683f7d5beb
tree2837c8f14309b59690f816d3a7dbf8718b0cae77
parentf4a37244cac024c8af907f7ead1fae73a2985bdf
parent700763f2da05ca70a5ff0342a7e7244c2545a9c7
[MERGE] upstream

bzr revid: fme@openerp.com-20140423123808-q58dtl8a0bb2ymlf
openerp/addons/base/ir/ir_qweb.py
openerp/addons/base/ir/ir_ui_view.py
openerp/http.py