[MERGE]Merge with trunk upto revision no 1011.
authorKunal Chavda (OpenERP) <kch@tinyerp.com>
Tue, 13 Sep 2011 05:44:06 +0000 (11:14 +0530)
committerKunal Chavda (OpenERP) <kch@tinyerp.com>
Tue, 13 Sep 2011 05:44:06 +0000 (11:14 +0530)
commitdf1edc236b17979df7a7ef54f59341bb4d1070cd
tree3aabeb3647e6bab3287f284ebda97fed10e26868
parent55e3e348726287e59decf47077965b1eb5b5cb42
parenta3a09a6229e251d5d861f11f9e654cd2100483ad
[MERGE]Merge with trunk upto revision no 1011.

bzr revid: kch@tinyerp.com-20110913054406-yrjafv0qdzzijizz
addons/web/__openerp__.py
addons/web/controllers/main.py
addons/web/static/src/js/boot.js
addons/web/static/src/js/chrome.js
addons/web/static/src/js/form.js
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml