From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Mon, 21 Oct 2013 12:20:19 +0000 (+0300)
Subject: Merge branch 'hotfix-0.11.1' into develop
X-Git-Tag: 0.12~1^2~4
X-Git-Url: https://code.grnet.gr/git/snf-image/commitdiff_plain/d2c9bf8ece9b818c8a5795f0cff1b11a983d6293

Merge branch 'hotfix-0.11.1' into develop
---

d2c9bf8ece9b818c8a5795f0cff1b11a983d6293
diff --cc version
index 865201c,af88ba8..677b95f
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- 0.10.1next
 -0.11.1
++0.11.1next
diff --cc version.m4
index 2092e54,cda7189..4e15515
--- a/version.m4
+++ b/version.m4
@@@ -1,1 -1,1 +1,1 @@@
- m4_define([devflow_version], [0.10.1next])
 -m4_define([devflow_version], [0.11.1])
++m4_define([devflow_version], [0.11.1next])