merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Thu, 8 Nov 2012 10:01:45 +0000 (11:01 +0100)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Thu, 8 Nov 2012 10:01:45 +0000 (11:01 +0100)
bzr revid: nicolas.vanhoren@openerp.com-20121108100145-i1ey2f6g07nri18a

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

Simple merge