[MERGE] merge with latest trunk
authorAmit Bhavsar (Open ERP) <amb@tinyerp.com>
Tue, 28 May 2013 08:58:53 +0000 (14:28 +0530)
committerAmit Bhavsar (Open ERP) <amb@tinyerp.com>
Tue, 28 May 2013 08:58:53 +0000 (14:28 +0530)
commit20210d96f8327961af7815fc5618b63e6bb0dc64
tree31042b227735e45a5e6dbe5053e12cd6109e08f3
parentd11391c5759d4308afde38abccea2e264c39d2d2
parent978c76c5ea6bf16f7db2f94630ceb4b27caec037
[MERGE] merge with latest trunk

bzr revid: amb@tinyerp.com-20130528085853-33ak0wen7shv6af2
17 files changed:
addons/web/__openerp__.py
addons/web/controllers/main.py
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/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