[MERGE]merge with main branch.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Fri, 9 Dec 2011 05:57:46 +0000 (11:27 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Fri, 9 Dec 2011 05:57:46 +0000 (11:27 +0530)
commit57aecd6bb18cec023a8ab923b213b1b3cb3bd538
tree81c538e09a9d91eff5d1c4761888b1f0484f2109
parenta84247b3f29df1b0464cc25a9b1f794ec8b196e4
parent59b89d88fd3622b4f3f228cde83734ad6861e3c1
[MERGE]merge with main branch.

bzr revid: vme@tinyerp.com-20111209055746-gel0yr4aum3gb76k
addons/web/static/src/js/views.js