Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Thu, 22 Dec 2011 10:00:02 +0000 (12:00 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Thu, 22 Dec 2011 10:00:02 +0000 (12:00 +0200)

Trivial merge