[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)
commite1bf4188561dae8476df9be5c73f9c0d23b46dfb
tree92bcead4cfc7455a28821954b472d99d2aa0beb4
parent1228cf5539b94f373543fe0822212340184000bd
parent60f74ff3f4c7bb1e5208b0f4be3ef2577a5645f4
[MERGE] trunk

bzr revid: fme@openerp.com-20140410173524-9oz7irm59a5d8d7g
addons/web/controllers/main.py
addons/web/static/src/js/chrome.js