Merge branch 'master' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 18 Jul 2013 08:26:14 +0000 (11:26 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 18 Jul 2013 08:26:14 +0000 (11:26 +0300)
Conflicts:
image_creator/version.py
version

1  2 
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"