Merge branch 'master' into debian-0.8
Conflicts:
pithos/settings.py
snf-pithos-app/pithos/middleware/log.py
snf-pithos-app/pithos/urls.py
snf-pithos-backend/pithos/backends/__init__.py
snf-pithos-tools/setup.py
- [DH] snf-pithos-app/pithos/api/faults.py
- [DH] snf-pithos-app/pithos/api/functions.py
- [DH] snf-pithos-app/pithos/api/public.py
- [DH] snf-pithos-app/pithos/api/templatetags/get_type.py
- [DH] snf-pithos-app/pithos/api/urls.py
- [DH] snf-pithos-app/pithos/api/util.py
- [DH] snf-pithos-app/pithos/middleware/log.py
- [DH] snf-pithos-app/pithos/middleware/secure.py
- [DH] snf-pithos-app/pithos/middleware/user.py
- [DH] snf-pithos-app/pithos/ui/views.py
- [DH] snf-pithos-app/pithos/urls.py