Merge branch 'es/rebase-i-respect-core-commentchar' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 2c49e42fe534fae04ca4311c7cf84ecfae244395..b4147d6db58133bb88d9011d1153410cf9f419ca 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.4-rc2
+DEF_VER=v1.8.4.1
 
 LF='
 '