Merge commit 'v0.9.0' into packaging

Conflicts:
	pithos/__init__.py
	pithos/api/management/commands/__init__.py
	pithos/backends/lib/rabbitmq/__init__.py
	pithos/backends/lib/rabbitmq/queue.py
	pithos/lib/user.py
	pithos/middleware/user.py
	pithos/settings.py
	pithos/ui/__init__.py
	pithos/ui/urls.py
	pithos/ui/views.py
	snf-pithos-app/pithos/api/settings.py
	snf-pithos-app/pithos/middleware/log.py
	snf-pithos-app/pithos/middleware/user.py
	snf-pithos-app/pithos/ui/settings.py
	snf-pithos-app/pithos/ui/templates/feedback_mail.txt
	snf-pithos-app/pithos/ui/views.py
	snf-pithos-lib/pithos/lib/__init__.py
	snf-pithos-tools/pithos/__init__.py
	snf-pithos-tools/pithos/tools/dispatcher.py

diff --cc snf-pithos-app/pithos/api/functions.py
Simple merge

diff --cc snf-pithos-app/pithos/api/management/__init__.py
index 0000000,e69de29..e69de29
mode 000000,100644..100644
--- /dev/null
--- 2/pithos/api/__init__.py
+++ b/snf-pithos-app/pithos/api/management/__init__.py

diff --cc snf-pithos-app/pithos/api/management/commands/__init__.py
index 0000000,e69de29..e69de29
mode 000000,100644..100644
--- /dev/null
--- 2/pithos/api/__init__.py
+++ b/snf-pithos-app/pithos/api/management/commands/__init__.py

diff --cc snf-pithos-app/pithos/api/management/commands/storagequota.py
index 0000000,e792549..e792549
mode 000000,100644..100644
--- /dev/null
--- 2/pithos/api/management/commands/storagequota.py
+++ b/snf-pithos-app/pithos/api/management/commands/storagequota.py

diff --cc snf-pithos-app/pithos/api/public.py
Simple merge

diff --cc snf-pithos-app/pithos/api/settings.py
Simple merge

diff --cc snf-pithos-app/pithos/api/synnefo_settings.py
index 0000000,328eb7a..328eb7a
mode 000000,100644..100644
--- /dev/null
--- 2/pithos/settings.py
+++ b/snf-pithos-app/pithos/api/synnefo_settings.py

diff --cc snf-pithos-app/pithos/api/urls.py
Simple merge

diff --cc snf-pithos-app/pithos/api/util.py
Simple merge

diff --cc snf-pithos-app/pithos/middleware/__init__.py
Simple merge

diff --cc snf-pithos-app/pithos/middleware/log.py
Simple merge

diff --cc snf-pithos-app/pithos/urls.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/base.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/hashfiler/blocker.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/hashfiler/mapper.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/hashfiler/store.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/rabbitmq/__init__.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/rabbitmq/queue.py
index 0000000,f53ad97..f53ad97
mode 000000,100644..100644
--- /dev/null
--- 2/pithos/backends/lib/rabbitmq/queue.py
+++ b/snf-pithos-backend/pithos/backends/lib/rabbitmq/queue.py

diff --cc snf-pithos-backend/pithos/backends/lib/sqlalchemy/__init__.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/sqlalchemy/groups.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/sqlalchemy/node.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/sqlalchemy/permissions.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/sqlalchemy/public.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/sqlalchemy/xfeatures.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/sqlite/__init__.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/sqlite/node.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/sqlite/permissions.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/sqlite/public.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/lib/sqlite/xfeatures.py
Simple merge

diff --cc snf-pithos-backend/pithos/backends/modular.py
Simple merge

diff --cc snf-pithos-lib/pithos/lib/client.py
Simple merge

diff --cc snf-pithos-lib/pithos/lib/dictconfig.py
index 0000000,167831b..167831b
mode 000000,100644..100644
--- /dev/null
--- 2/pithos/lib/dictconfig.py
+++ b/snf-pithos-lib/pithos/lib/dictconfig.py

diff --cc snf-pithos-lib/pithos/lib/queue.py
index 0000000,eb48e1d..eb48e1d
mode 000000,100755..100755
--- /dev/null
--- 2/pithos/lib/queue.py
+++ b/snf-pithos-lib/pithos/lib/queue.py

diff --cc snf-pithos-lib/pithos/lib/user.py
Simple merge

diff --cc snf-pithos-lib/pithos/lib/util.py
Simple merge

diff --cc snf-pithos-tools/pithos/tools/dispatcher.py
index 2138ac6,c1f59f9..d1af303
--- 1/snf-pithos-tools/pithos/tools/dispatcher.py
--- 2/pithos/tools/dispatcher.py
+++ b/snf-pithos-tools/pithos/tools/dispatcher.py
@@@ -130,6 -115,3 +115,6 @@@ def main()
      except KeyboardInterrupt:
          pass
  
++
 +if __name__ == '__main__':
 +    main()
- 

diff --cc snf-pithos-tools/pithos/tools/fs.py
Simple merge

diff --cc snf-pithos-tools/pithos/tools/sh.py
Simple merge

diff --cc snf-pithos-tools/pithos/tools/sync.py
Simple merge

diff --cc snf-pithos-tools/pithos/tools/test.py
Simple merge