Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 28 Feb 2012 10:12:02 +0000 (12:12 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 28 Feb 2012 10:12:02 +0000 (12:12 +0200)

Trivial merge