[Merge]Merge with trunk
authorVishmita Jadeja (openerp) <vja@tinyerp.com>
Wed, 1 May 2013 05:41:29 +0000 (11:11 +0530)
committerVishmita Jadeja (openerp) <vja@tinyerp.com>
Wed, 1 May 2013 05:41:29 +0000 (11:11 +0530)
commit3b7863b479593fd6f2ccba8996f227f8d2e7df25
tree0ce0101d6938cc5217c2ab69b52126a369766b3e
parentae6d15de59251618a21d4520e50456fd9777de33
parent511efd43a90b6bbc30bac9764358fc81b42fb13a
[Merge]Merge with trunk

bzr revid: vja@tinyerp.com-20130501054129-2ie8kj73yosxbfo8
22 files changed:
addons/web/__openerp__.py
addons/web/controllers/main.py
addons/web/http.py
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/fixbind.js
addons/web/static/src/js/chrome.js
addons/web/static/src/js/data.js
addons/web/static/src/js/formats.js
addons/web/static/src/js/search.js
addons/web/static/src/js/testing.js
addons/web/static/src/js/view_form.js
addons/web/static/src/js/view_list.js
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml
addons/web/static/test/data.js
addons/web/static/test/search.js
addons/web_calendar/static/src/js/calendar.js
addons/web_diagram/controllers/main.py
addons/web_kanban/static/src/css/kanban.css
addons/web_kanban/static/src/css/kanban.sass
addons/web_view_editor/static/src/js/view_editor.js