From: Kostas Papadimitriou <kpap@grnet.gr>
Date: Wed, 3 Jul 2013 07:52:44 +0000 (+0300)
Subject: Merge branch 'hotfix-0.14.1' into develop
X-Git-Tag: 0.15rc1~24^2
X-Git-Url: https://code.grnet.gr/git/snf-cloudcms/commitdiff_plain/11b7656042e3ca307f6d9fcd83ac1f9780d8419b?hp=aee74b601fc8ecfd84c6e00a01ce9ee73e4db4c8

Merge branch 'hotfix-0.14.1' into develop

Conflicts:
	version
---

diff --git a/version b/version
index 948a547..e81d965 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.14
+0.14next