[MERGE] openerp-web.
authorVaibhav (OpenERP) <vda@tinyerp.com>
Thu, 25 Aug 2011 12:32:48 +0000 (18:02 +0530)
committerVaibhav (OpenERP) <vda@tinyerp.com>
Thu, 25 Aug 2011 12:32:48 +0000 (18:02 +0530)
bzr revid: vda@tinyerp.com-20110825123248-px72llfueox1wnez

1  2 
addons/base/static/src/js/form.js

Simple merge