Merge branch 'master' into debian-0.9
[pithos] / snf-pithos-app / conf /
drwxr-xr-x   ..
-rw-r--r-- 1027 20-snf-pithos-app-settings.conf