Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 6 Sep 2011 14:00:01 +0000 (17:00 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 6 Sep 2011 14:00:01 +0000 (17:00 +0300)
commit74f76d6a291c40a5389435d64ff8c9df7c71a587
treea318768527164fe39b77f52e23450f5c35e7b205
parentfe232f2443b1f37e5f4b45960a98506e5f73b580
parent937dc831635126ce91ce00220ccb847a713110e5
Merge branch 'master' of https://code.grnet.gr/git/pithos

Conflicts:
pithos/backends/lib_alchemy/node.py
pithos/backends/lib_alchemy/permissions.py