[MERGE] Merged with web/trunk.
authorThibault Delavallée <tde@openerp.com>
Wed, 11 Jul 2012 07:56:41 +0000 (09:56 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 11 Jul 2012 07:56:41 +0000 (09:56 +0200)
bzr revid: tde@openerp.com-20120710123433-5a9721r0yag21ybh
bzr revid: tde@openerp.com-20120711075641-izq3ulv658gmb2v7

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

Simple merge