[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 26 Mar 2012 09:58:42 +0000 (11:58 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 26 Mar 2012 09:58:42 +0000 (11:58 +0200)
commit2059123918023bf05aafce33d27a1cc22ef4299a
tree3d9de7a083cc755b302c9b274f5e7f5448eec531
parent2bcb2d3bf5aa45536606d2e6525f6a358207307a
parent888a9d3c0f611dace5dcdd13947c0e6c8a50259e
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20120326095842-mf8v3nhizeqcfp8j
addons/web/controllers/main.py
addons/web/static/src/js/chrome.js
addons/web/static/src/js/core.js
addons/web/static/src/js/view_form.js
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml