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

Trivial merge