[MERGE] merge lp:~openerp-dev/openobject-addons/trunk-bug-1047365-mma
[odoo/odoo.git] / addons / base_tools /
drwxr-xr-x   ..
drwxr-xr-x - i18n