[MERGE]Merge Trunk
authorVishmita <vja@tinyerp.com>
Thu, 11 Oct 2012 10:01:13 +0000 (15:31 +0530)
committerVishmita <vja@tinyerp.com>
Thu, 11 Oct 2012 10:01:13 +0000 (15:31 +0530)
commita0d781264ca96ea813fb507cdeb57c07fd44247d
treec5ba007e5a65465d8d571b1537424e46ab02f0bd
parentf44f548f066e98d62b05ec762e46997d85a7a932
parent70afbd796e441cce26171af03c26a08f88c3ab52
[MERGE]Merge Trunk

bzr revid: vja@tinyerp.com-20121011100113-pm14yibib3qw8nqx
addons/web/doc/conf.py
addons/web_diagram/static/src/js/diagram.js