Merge branch 'hotfix-0.14.1' into develop
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 3 Jul 2013 07:52:44 +0000 (10:52 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 3 Jul 2013 07:52:44 +0000 (10:52 +0300)
Conflicts:
version

version

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