[MERGE]Trunk.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 5 May 2014 04:32:33 +0000 (10:02 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 5 May 2014 04:32:33 +0000 (10:02 +0530)
commite41508cb8d7fd2a2c06e3fab9ce1503e8efa30fa
tree8e0fbb849cebc9b3ac0f87355a5248f51826a491
parent4312b921f3db41529cbd4f501a6b5dcba2bebd08
parent8fbebfd752fa8933584711522675d354b3217839
[MERGE]Trunk.

bzr revid: vme@tinyerp.com-20140505043233-2t2e2vb1yv86hyxp
addons/web/static/src/js/chrome.js