[MERGE]7.0
authorVidhin Mehta <vme@tinyerp.com>
Thu, 21 Feb 2013 09:44:53 +0000 (15:14 +0530)
committerVidhin Mehta <vme@tinyerp.com>
Thu, 21 Feb 2013 09:44:53 +0000 (15:14 +0530)
bzr revid: vme@tinyerp.com-20130221094453-dupm500oez98cv13

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

Simple merge