Merge branch 'master' of https://code.grnet.gr/git/pithos
authorAntony Chazapis <chazapis@gmail.com>
Wed, 14 Dec 2011 16:42:05 +0000 (18:42 +0200)
committerAntony Chazapis <chazapis@gmail.com>
Wed, 14 Dec 2011 16:42:05 +0000 (18:42 +0200)

Trivial merge