From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Wed, 17 Jul 2013 12:53:39 +0000 (+0300)
Subject: Merge branch 'master' into debian-precise
X-Git-Tag: debian/0.4.2-1precise~1
X-Git-Url: https://code.grnet.gr/git/snf-image-creator/commitdiff_plain/de99af0024ade42ab6d98e869f1dfe4867838f67

Merge branch 'master' into debian-precise
---

de99af0024ade42ab6d98e869f1dfe4867838f67