Merge commit '8206fbf', due to my screwup of committing it on a detached

[nmh] / VERSION

diff --git a/VERSION b/VERSION
index 29b86d6..0118937 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2-RC1
+1.6+dev