fix mistake during the merge from erp5 branch to master. Removing diff tags slapos.cookbook-0.42
-rw-r--r-- 106 .gitignore
-rw-r--r-- 7839 CHANGES.txt
-rw-r--r-- 292 MANIFEST.in
-rw-r--r-- 61 README.txt
drwxr-xr-x - component
-rw-r--r-- 6806 setup.py
drwxr-xr-x - slapos
drwxr-xr-x - software
drwxr-xr-x - stack