From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Wed, 8 Jan 2014 10:33:08 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Tag: 0.6~1
X-Git-Url: https://code.grnet.gr/git/snf-image-creator/commitdiff_plain/37d1ea11cc79b7e45db9049df745abd3f147e031?hp=93e56bf604b793c1dc3be8553e6cb75fc1c1c5c4

Merge branch 'develop'
---