Added by Antony Chazapis over 12 years ago
Merge branch 'permissions'
Conflicts: pithos/backends/modular.py