Merge branch 'master' into erp5testnode
-rw-r--r-- 99 .gitignore
-rw-r--r-- 1912 CHANGES.txt
-rw-r--r-- 148 MANIFEST.in
-rw-r--r-- 32 README.txt
drwxr-xr-x - component
-rw-r--r-- 2912 setup.py
drwxr-xr-x - slapos
drwxr-xr-x - software
drwxr-xr-x - stack