[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Wed, 16 Apr 2014 08:29:17 +0000 (10:29 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 16 Apr 2014 08:29:17 +0000 (10:29 +0200)
bzr revid: tde@openerp.com-20140416082917-lnqc60vm3cid3gl6

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

Simple merge