From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Mon, 27 May 2013 13:18:38 +0000 (+0300)
Subject: Merge branch 'master' into ubuntu
X-Git-Tag: debian/0.4.1-1precise~4
X-Git-Url: https://code.grnet.gr/git/snf-image-creator/commitdiff_plain/64a18daf38268b4d3db0bb1e1ec4a4434858cee9

Merge branch 'master' into ubuntu
---

64a18daf38268b4d3db0bb1e1ec4a4434858cee9