[MERGE] merge upstream + code adaptation to revid:al@openerp.com-20110927001435-vttw2...
[odoo/odoo.git] / addons / web / controllers /
drwxr-xr-x   ..
-rw-r--r-- 12 __init__.py
-rw-r--r-- 60317 main.py