Merge branch 'master' of https://code.grnet.gr/git/pithos
authorchazapis <chazapis@gmail.com>
Wed, 21 Dec 2011 16:25:49 +0000 (18:25 +0200)
committerchazapis <chazapis@gmail.com>
Wed, 21 Dec 2011 16:25:49 +0000 (18:25 +0200)

Trivial merge