Merge branch 'master' into packaging
[pithos] / snf-pithos-backend / pithos / backends / settings.py
2012-01-18 Kostas PapadimitriouExtend snf-common default settings