[MERGE] Latest trunk.
authorvta vta@openerp.com <>
Mon, 6 Aug 2012 12:23:24 +0000 (14:23 +0200)
committervta vta@openerp.com <>
Mon, 6 Aug 2012 12:23:24 +0000 (14:23 +0200)
commit22b25ce40bab94c30a85f620a01ef24133df4d0f
tree55ed9636e6a858d27168b4cb5dfe318a0eea5b03
parent9d15842745237d20aff5e425a3ca3c8acbf17fb9
parent8cecaa14f3f9b3ed48adccf4ebf933e67cd8b714
[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20120806122324-scngm3qpi7qfblvm
addons/web/static/src/js/view_form.js
addons/web/static/src/xml/base.xml