From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Wed, 1 May 2013 17:39:08 +0000 (+0300)
Subject: Merge branch 'master' into ubuntu
X-Git-Tag: debian/0.4.1-1precise~6
X-Git-Url: https://code.grnet.gr/git/snf-image-creator/commitdiff_plain/4df0bc466aef1a5c40b200c80ced9f9ef9065b82

Merge branch 'master' into ubuntu
---

4df0bc466aef1a5c40b200c80ced9f9ef9065b82