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

Merge branch 'hotfix-0.14.1' into develop

Conflicts:
	version
---

11b7656042e3ca307f6d9fcd83ac1f9780d8419b
diff --cc version
index ce2f120,948a547..e81d965
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- 0.14next
 -0.14
++0.14next