Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Wed, 23 Nov 2011 13:39:46 +0000 (15:39 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Wed, 23 Nov 2011 13:39:46 +0000 (15:39 +0200)

Trivial merge