[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Thu, 27 Feb 2014 10:17:45 +0000 (11:17 +0100)
committerFabien Meghazi <fme@openerp.com>
Thu, 27 Feb 2014 10:17:45 +0000 (11:17 +0100)
commitc1d9449a572757d3e316d7e88b7bce6618818074
tree233e5004d23fc9334f8b13dcb11c66877bb0b970
parent92b8aafe97d94deacb06b37503a05d80b25dbba8
parent71537320c5aa47ac38e00aa68a79fcaf9bdeff99
[MERGE] upstream

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