[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)
bzr revid: vme@tinyerp.com-20130131124640-4tsf41tur9ykuu99

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

Simple merge
Simple merge