[merge]upto revno.1054.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 19 Sep 2011 06:10:00 +0000 (11:40 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 19 Sep 2011 06:10:00 +0000 (11:40 +0530)
commitc45b2748abaad1889764ae4c6dedb7241c54fb00
tree5bf1a1d46939230b41849fbb01b345150a892609
parent28a13263c9c109d4a2c04831291308992b0b4c6e
parentb1d49ca31fd14366452565b5a098619a7cde87ea
[merge]upto revno.1054.

bzr revid: vme@tinyerp.com-20110919061000-4h16q60a9zy6diy7
addons/web/__openerp__.py
addons/web/static/src/css/base.css
addons/web/static/src/js/core.js
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml