Merge branch 'jc/same-encoding' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 3c0e89c4cbd5665852ddc93c8a7515822dbaf19e..d66e54f12d0ab564ed1944b2c6c264366045dfe5 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.0-rc2
+DEF_VER=v1.8.0.1
 
 LF='
 '