[MERGE] Merge with trunk upto revision no 1400.
authorYogesh (OpenERP) <ysa@tinyerp.com>
Tue, 1 Nov 2011 06:07:43 +0000 (11:37 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Tue, 1 Nov 2011 06:07:43 +0000 (11:37 +0530)
commit8fcf3cf5d980c022f85de38acc86c8002501b531
tree8646f5c9ef14848cb1aa8c1b11ac6c19d7764a6f
parent55ad46220db83d2f5d6dd86d243d0d9843b74511
parent3d22bb8b55d48e5ee8226f023555f003288b157a
[MERGE] Merge with trunk upto revision no 1400.

bzr revid: ysa@tinyerp.com-20111101060743-3e79d5yg8pgww57h
addons/web/__openerp__.py
addons/web/static/src/css/base.css
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml