Merge remote-tracking branch 'upstream/7.0' into 7.0-travis
[odoo/odoo.git] / openerp / conf /
drwxr-xr-x   ..
-rw-r--r-- 1974 __init__.py
-rw-r--r-- 1602 deprecation.py