Merge branch 'nd/git-dir-pointing-at-gitfile' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ede98a8c160d06cfa3068decfa765ae896792ef9..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-rc1
+DEF_VER=v1.8.4.1
 
 LF='
 '