[MERGE] Merged with web/trunk.
authorThibault Delavallée <tde@openerp.com>
Mon, 2 Jul 2012 17:00:10 +0000 (19:00 +0200)
committerThibault Delavallée <tde@openerp.com>
Mon, 2 Jul 2012 17:00:10 +0000 (19:00 +0200)
commit864d0112006bfcb1914a1613927d7294c9037516
tree7112fde3aa9445f6a53d8b7f50d1d59102dc9a4d
parent30b384463893ab460a460cb6f547c391cd7da8d9
parenta9e48f157112fd1c4acf0dbf1f4d1ecd26f97e13
[MERGE] Merged with web/trunk.

bzr revid: tde@openerp.com-20120702170010-x07duh86vejoup9u
addons/web/__openerp__.py
addons/web/static/src/js/view_form.js