From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Fri, 21 Jun 2013 11:01:35 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 0.4.1~3
X-Git-Url: https://code.grnet.gr/git/snf-image-creator/commitdiff_plain/be739023c9d32182bdd81b65289d24abbdc83592

Merge branch 'develop'
---

be739023c9d32182bdd81b65289d24abbdc83592