Merge branch 'rt/commentchar-fmt-merge-msg' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index c725291fcc59fc2bacfc0d37d88b880c2d511a02..26422bfc22e979cf0497adad076e6b17fa50e2ca 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.2-rc3
+DEF_VER=v1.8.2.1
 
 LF='
 '