Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 22 May 2012 14:51:51 +0000 (17:51 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 22 May 2012 14:51:51 +0000 (17:51 +0300)
commit205dd2f057ee4b9a239a812e5877270a66275737
tree19d67efa4c00d69a3fb67efea5dc164c70744a9d
parent90ee1eb3f3dd4f7cbb9e0cb3f007ec577247ec55
parentcb277d767d0ca5fad294c11d3bdc3244a2d9f7fd
Merge branch 'master' of https://code.grnet.gr/git/pithos
snf-pithos-app/pithos/api/settings.py