[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)
commite9dc0421c842c1d8951664b7f55faedf6c578c51
tree579872bdef8667872a6f9cd14cc54740fb8c8327
parent5d6e4af5294ba96772a10a21ac4f1c5a2d15ed80
parent987ae161a35ee09b3d8175776720c14c4ebe4ba1
[MERGE]trunk.

bzr revid: vme@tinyerp.com-20121029103508-g9apxrn9y3o3kazz
addons/web/static/src/js/chrome.js