[MERGE]Merge with trunk upto revision no 1054.
[odoo/odoo.git] / addons / web_diagram / controllers / __init__.py
2011-09-05 Antony Lesuisserename base into web part1