[MERGE] from trunk
[odoo/odoo.git] / addons / base_contact /
drwxr-xr-x   ..
drwxr-xr-x - i18n