[MERGE]Merge Trunk
authorVishmita <vja@tinyerp.com>
Thu, 11 Oct 2012 10:28:37 +0000 (15:58 +0530)
committerVishmita <vja@tinyerp.com>
Thu, 11 Oct 2012 10:28:37 +0000 (15:58 +0530)
commitffe8dd604a833ae8c3f6b8d1fd6ccdfa02b256bb
tree44d7961b09e4678c0ba8f3c4bc1ece4469213b6c
parent3e15613cf7783df5175f52d0ba4945ba54890f98
parent70afbd796e441cce26171af03c26a08f88c3ab52
[MERGE]Merge Trunk

bzr revid: vja@tinyerp.com-20121011102837-k0y1kvf901rp3l8u
addons/web/doc/conf.py
addons/web_view_editor/static/src/js/view_editor.js