From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Thu, 10 Oct 2013 13:48:30 +0000 (+0300)
Subject: Merge branch 'hotfix-0.5.3' into develop
X-Git-Tag: 0.6~1^2~16
X-Git-Url: https://code.grnet.gr/git/snf-image-creator/commitdiff_plain/920c6c7a6159ee0486498d0ce2ba9c6d73a69230

Merge branch 'hotfix-0.5.3' into develop

Conflicts:
	image_creator/version.py
	version
---

920c6c7a6159ee0486498d0ce2ba9c6d73a69230
diff --cc image_creator/version.py
index 3158b73,351ff30..8d88873
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@@ -1,8 -1,8 +1,8 @@@
  
- __version__ = "0.5.2next"
 -__version__ = "0.5.3"
++__version__ = "0.5.3next"
  __version_vcs_info__ = {
 -    'branch': 'hotfix-0.5.3',
 -    'revid': 'dc0ecb2',
 +    'branch': 'develop',
-     'revid': '694ca1e',
-     'revno': 396}
++    'revid': '2a62304',
+     'revno': 402}
  __version_user_email__ = "skalkoto@grnet.gr"
  __version_user_name__ = "Nikos Skalkotos"
diff --cc version
index 26ab8ec,be14282..3f4f53f
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- 0.5.2next
 -0.5.3
++0.5.3next