[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)
bzr revid: fme@openerp.com-20140423123735-fc38fzp3mtai8xnb

1  2 
addons/web/controllers/main.py
addons/web/static/src/js/chrome.js

Simple merge
Simple merge