[MERGE]Trunk.
authorVidhin Mehta <vme@tinyerp.com>
Thu, 31 Jan 2013 12:46:40 +0000 (18:16 +0530)
committerVidhin Mehta <vme@tinyerp.com>
Thu, 31 Jan 2013 12:46:40 +0000 (18:16 +0530)
commit7a31d2827a38139f6157d71c936b59f654f6294b
tree2877f95c50baf8a68b29f83c44597b6a412cbd2b
parentd80edf0da259141ca91a070e8f5ced8a27c29cc7
parentbd3d0384fd49ecdf70ca4001e629d0e05d6f5191
[MERGE]Trunk.

bzr revid: vme@tinyerp.com-20130131124640-4tsf41tur9ykuu99
addons/web/__openerp__.py
addons/web/static/src/js/view_form.js