From: Antony Chazapis <chazapis@gmail.com>
Date: Wed, 4 Jan 2012 15:16:57 +0000 (+0200)
Subject: Merge branch 'master' into id
X-Git-Tag: pithos/v0.8.3~25
X-Git-Url: https://code.grnet.gr/git/pithos/commitdiff_plain/0a5bd1858beb7dbfb2d9781496d34c4b157c5881

Merge branch 'master' into id
---

0a5bd1858beb7dbfb2d9781496d34c4b157c5881