[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 31 Jul 2012 05:18:35 +0000 (10:48 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 31 Jul 2012 05:18:35 +0000 (10:48 +0530)
bzr revid: apa@tinyerp.com-20120731051835-xr1r5vqiq7bcsapd

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

Simple merge