[MERGE] Sync with trunk, tried to resolve the conflicts without breakign everything.
[odoo/odoo.git] / addons / auth_crypt /
drwxr-xr-x   ..
-rw-r--r-- 1050 __init__.py
-rw-r--r-- 1628 __openerp__.py
-rw-r--r-- 5310 auth_crypt.py
drwxr-xr-x - i18n