[MERGE]trunk.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 29 Oct 2012 10:35:08 +0000 (16:05 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 29 Oct 2012 10:35:08 +0000 (16:05 +0530)
bzr revid: vme@tinyerp.com-20121029103508-g9apxrn9y3o3kazz

1  2 
addons/web/static/src/js/chrome.js

Simple merge