Merge origin/master into mdv-gpl3-py26mastermdv-gpl3-py26
[openerp-server.git] / man / 
tree8746786d6ff0514d2e088c04c49aece8d9c843b0
drwxr-xr-x   ..
-rw-r--r-- 5426 openerp-server.1
-rw-r--r-- 1846 openerp_serverrc.5