[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Wed, 23 Apr 2014 12:37:35 +0000 (14:37 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 23 Apr 2014 12:37:35 +0000 (14:37 +0200)
commitd4b534e7be3586fe17bbb237dd0fd7cdcdb7652c
tree83ca6d215b4622dc23b6856f4429725c20f0a2ed
parentbc1878e3e2d6bb8d76be6f02dfda0d844b5062c8
parent8ee8b7bde68a550e2950df75754ad387c8ae13b1
[MERGE] upstream

bzr revid: fme@openerp.com-20140423123735-fc38fzp3mtai8xnb
addons/web/controllers/main.py
addons/web/static/src/js/chrome.js