Merge branch 'master' of https://code.grnet.gr/git/pithos
authorSofia Papagiannaki <papagian@gmail.com>
Fri, 17 Feb 2012 16:01:29 +0000 (18:01 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Fri, 17 Feb 2012 16:01:29 +0000 (18:01 +0200)

Trivial merge