merge upstream
authorChristophe Simonis <chs@openerp.com>
Fri, 18 Nov 2011 13:26:06 +0000 (14:26 +0100)
committerChristophe Simonis <chs@openerp.com>
Fri, 18 Nov 2011 13:26:06 +0000 (14:26 +0100)
commitf994e70e41d133d8f6430dac3c7b1bef90cdea7e
treef2bf8e8602f580dce526b7a42a2cf86117ac8f71
parent4e85f0762cc69af8efdb88ec857329ac955afe0b
parente6f0378bd8e290606fe09ac29788e3f633a345a3
merge upstream

bzr revid: chs@openerp.com-20111117125432-zhfrcyrtwy9b9cv8
bzr revid: chs@openerp.com-20111118132606-6gh7zmrx7606w8fv
addons/web/common/http.py
addons/web/static/src/js/core.js
addons/web/static/src/xml/base.xml