[MERGE] trunk
authorFabien Meghazi <fme@openerp.com>
Thu, 10 Apr 2014 17:35:24 +0000 (19:35 +0200)
committerFabien Meghazi <fme@openerp.com>
Thu, 10 Apr 2014 17:35:24 +0000 (19:35 +0200)
bzr revid: fme@openerp.com-20140410173524-9oz7irm59a5d8d7g

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

Simple merge
Simple merge