Merge branch 'master' into apache
-rw-r--r-- 106 .gitignore
-rw-r--r-- 7326 CHANGES.txt
-rw-r--r-- 194 MANIFEST.in
-rw-r--r-- 61 README.txt
drwxr-xr-x - component
-rw-r--r-- 6226 setup.py
drwxr-xr-x - slapos
drwxr-xr-x - software
drwxr-xr-x - stack