Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Thu, 19 Jul 2012 13:51:10 +0000 (16:51 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Thu, 19 Jul 2012 13:51:10 +0000 (16:51 +0300)

Trivial merge