From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Thu, 18 Jul 2013 08:26:14 +0000 (+0300)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.5~1^2~16
X-Git-Url: https://code.grnet.gr/git/snf-image-creator/commitdiff_plain/64556e630fdf69f62ef08bd77f25aa49205f91cc

Merge branch 'master' into develop

Conflicts:
	image_creator/version.py
	version
---

64556e630fdf69f62ef08bd77f25aa49205f91cc
diff --cc image_creator/version.py
index 9991964,62b2453..2026ff2
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@@ -1,8 -1,8 +1,8 @@@
--
- __version__ = "0.4.2next"
+ __version__ = "0.4.3"
  __version_vcs_info__ = {
-     'branch': 'develop',
-     'revid': '9d48081',
-     'revno': 325}
+     'branch': 'master',
+     'revid': '9f0e45e',
+     'revno': 319}
++>>>>>>> master
  __version_user_email__ = "skalkoto@grnet.gr"
  __version_user_name__ = "Nikos Skalkotos"