[MERGE] changes required for the "import hook" commit in the server.
[odoo/odoo.git] / doc /
drwxr-xr-x   ..
-rw-r--r-- 4610 Makefile
-rw-r--r-- 4523 make.bat
drwxr-xr-x - source