Merge branch 'b0.2'

Conflicts: Makefile NEWS
2014-06-11 19:30:32 +02:00
parent 5a8b9021c8 9afc59da5e
commit 1bb8b85503
9 changed files with 75 additions and 33 deletions
@@ -18,7 +18,7 @@ UPGRADABLE = \
  0.1.0 \
  0.1.1 \
  0.2.0 \
-  0.2.0dev \
+  0.2.1 \
  $(EXTVERSION)next \
  $(END)