Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 21 Jun 2011 14:40:11 +0000 (17:40 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 21 Jun 2011 14:40:11 +0000 (17:40 +0300)

Trivial merge