[MERGE]Merge with trunk upto revision no 1054.
[odoo/odoo.git] / addons / web_diagram / controllers / main.py
2011-09-06 Xavier Morel[MERGE] diagram view
2011-09-05 Antony Lesuisserenamse base to web part2
2011-09-05 Antony Lesuisserename base into web part1