[MERGE]trunk.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Fri, 12 Oct 2012 11:47:59 +0000 (17:17 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Fri, 12 Oct 2012 11:47:59 +0000 (17:17 +0530)
bzr revid: vme@tinyerp.com-20121012114759-gno4bovsdi5u7uuj

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

Simple merge