[MERGE] from 7.0
authorXavier Morel <xmo@openerp.com>
Wed, 13 Mar 2013 09:49:09 +0000 (10:49 +0100)
committerXavier Morel <xmo@openerp.com>
Wed, 13 Mar 2013 09:49:09 +0000 (10:49 +0100)
commit94c2c42be6fc0bdf55421b3fe4c1d4c7db1f4bed
tree395948faff8d6874a5094dc632b238a8eff32b4e
parenta67b8721848083a9336317139e508c338d925f73
parentf79f6a5a25a0708e662f2deed4a54c704c6872b5
[MERGE] from 7.0

bzr revid: xmo@openerp.com-20130313094909-u21ee88l2lak9p2x
addons/web/controllers/main.py
addons/web/http.py
addons/web/static/src/css/base.sass
addons/web/static/src/js/chrome.js
addons/web/static/src/js/corelib.js
addons/web/static/src/js/search.js
addons/web/static/src/js/view_form.js
addons/web/static/src/xml/base.xml