[MERGE]Merge Trunk
authorVishmita <vja@tinyerp.com>
Thu, 11 Oct 2012 06:27:21 +0000 (11:57 +0530)
committerVishmita <vja@tinyerp.com>
Thu, 11 Oct 2012 06:27:21 +0000 (11:57 +0530)
commit79d6687b4aebd777621b5edfc832548f55dc78d3
treee2fd362a5da96b2c664bad489985b0e0aa771d5c
parent884aecd5df0c9760a14888dcab6b8f5d6b1655bb
parentf44ea704fe562dc346b280c6f546e5bc8d630387
[MERGE]Merge Trunk

bzr revid: vja@tinyerp.com-20121011062721-ah60e7lrtg07ng5x
addons/web/doc/conf.py
addons/web/static/src/js/view_form.js