[MERGE] forward port of branch saas-2 up to revid 3897 dle@openerp.com-20140115121441...
authorChristophe Simonis <chs@openerp.com>
Wed, 15 Jan 2014 22:13:49 +0000 (23:13 +0100)
committerChristophe Simonis <chs@openerp.com>
Wed, 15 Jan 2014 22:13:49 +0000 (23:13 +0100)
commit0e870fc7a7a0359e68fce1a9bc8d9b1a3dd24252
tree317e2b763f5a664347cf1981fd72a30890d5cdb5
parent91aaaec0a5949b6d68066bc7b643835f310fd7d7
parent5649e0bbf2350adad07e8ac642cce11ed3922aea
[MERGE] forward port of branch saas-2 up to revid 3897 dle@openerp.com-20140115121441-bskbyxxbc09ubavh

bzr revid: chs@openerp.com-20140115221349-3lw7b0kpo3f2d04l
addons/web/controllers/main.py
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/chrome.js
addons/web/static/src/js/data.js
addons/web/static/src/js/search.js
addons/web/static/src/js/view_form.js