[MERGE] merged mtr's branch with new name for salary.head
[odoo/odoo.git] / bin /
drwxr-xr-x   ..
drwxr-xr-x - addons
-rwxr-xr-x 565 openerp-server.py