[MERGE] merge from trunk addons
[odoo/odoo.git] / addons / product_manufacturer /
drwxr-xr-x   ..
-rwxr-xr-x 1051 __init__.py
-rwxr-xr-x 1510 __openerp__.py
drwxr-xr-x - i18n
-rwxr-xr-x 1864 product_manufacturer.py
-rwxr-xr-x 2358 product_manufacturer_view.xml
drwxr-xr-x - security