[MERGE] Merge with trunk upto revision no 1218.
[odoo/odoo.git] / man /
drwxr-xr-x   ..
-rw-r--r-- 6292 openerp-server.1
-rw-r--r-- 1846 openerp_serverrc.5