Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Thu, 14 Jul 2011 09:55:16 +0000 (12:55 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Thu, 14 Jul 2011 09:55:16 +0000 (12:55 +0300)
commitef43dff1ce3f36a81cc69e7ca9296e2a4b8a1849
treee46616d0052bb98995c9e2301ca5b97fb287ba9f
parent23028d318aee89ee5cb0424a59631722f3a89f41
parent4cd3289d96a3e06682eb3a974a18066650ead604
Merge branch 'master' of https://code.grnet.gr/git/pithos

Conflicts:
pithos/api/tests.py
docs/source/devguide.rst
pithos/api/functions.py