From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Fri, 23 Aug 2013 14:17:33 +0000 (+0300)
Subject: Merge branch 'hotfix-0.5.1'
X-Git-Tag: 0.5.2~3
X-Git-Url: https://code.grnet.gr/git/snf-image-creator/commitdiff_plain/be997992af4d1612d149870dc296c2c46c528025

Merge branch 'hotfix-0.5.1'
---

be997992af4d1612d149870dc296c2c46c528025