[MERGE] wiht lp:~openerp-dev/openobject-addons/trunk-dev-addons1
[odoo/odoo.git] / addons / outlook / plugin /
drwxr-xr-x   ..
drwxr-xr-x - openerp-outlook-plugin