From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Thu, 6 Jun 2013 10:02:18 +0000 (+0300)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.4.1~3^2~5
X-Git-Url: https://code.grnet.gr/git/snf-image-creator/commitdiff_plain/9c060ab0030a278c47a99976dccd8a077f034b70

Merge branch 'master' into develop
---

9c060ab0030a278c47a99976dccd8a077f034b70