Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Fri, 12 Aug 2011 14:31:46 +0000 (17:31 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Fri, 12 Aug 2011 14:31:46 +0000 (17:31 +0300)

Trivial merge