Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Wed, 7 Sep 2011 15:13:52 +0000 (18:13 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Wed, 7 Sep 2011 15:13:52 +0000 (18:13 +0300)

Trivial merge