Merge branch 'dev' of https://code.grnet.gr/git/pithos into dev
authorroot <root@dev84.dev.grnet.gr>
Mon, 12 Nov 2012 10:44:30 +0000 (12:44 +0200)
committerroot <root@dev84.dev.grnet.gr>
Mon, 12 Nov 2012 10:44:30 +0000 (12:44 +0200)
commit8313c6817e50e347cf47f7e6b703a7870d262cf0
treeb2dfa8025ac8bd29ffca72a91d5d9b56cc155d5c
parent57e09fb4b471c8d3d4c627bd5143850a32e33f52
parent21a85c0b14f4c82a657f406f870e0aafe582a6d7
Merge branch 'dev' of https://code.grnet.gr/git/pithos into dev

Conflicts:
snf-pithos-app/pithos/api/util.py
snf-pithos-backend/pithos/backends/modular.py
snf-pithos-app/pithos/api/settings.py
snf-pithos-app/pithos/api/util.py
snf-pithos-backend/pithos/backends/modular.py
snf-pithos-backend/pithos/backends/util.py