[merge]merge with main lp:openerp-web branch.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Thu, 3 Nov 2011 11:12:55 +0000 (16:42 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Thu, 3 Nov 2011 11:12:55 +0000 (16:42 +0530)
commitbf5046c4a1bb7292ffe7822eef22b864c934d49c
tree1a71b788771bdb6671c3737973d190bde6921b12
parent6abfc1713b92cc5af1a6fc41489c234fc27f1572
parenta2a6c33951084f302c04c6844e0a125dcf485f25
[merge]merge with main lp:openerp-web branch.

bzr revid: vme@tinyerp.com-20111103111255-gcj2jfpk5d3640hg
addons/web/static/src/js/view_editor.js