[MERGE] Latest trunk.
authorvta vta@openerp.com <>
Thu, 11 Oct 2012 13:05:00 +0000 (15:05 +0200)
committervta vta@openerp.com <>
Thu, 11 Oct 2012 13:05:00 +0000 (15:05 +0200)
bzr revid: vta@openerp.com-20121011130500-y8zhrjwv3g4j2pn3

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

Simple merge