merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 5 Nov 2012 11:01:52 +0000 (12:01 +0100)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 5 Nov 2012 11:01:52 +0000 (12:01 +0100)
bzr revid: nicolas.vanhoren@openerp.com-20121105110152-f0vcwtzn334qtxq0

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

Simple merge