Merge branch 'maint-1.8.5' into maint-1.9

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e66a5abb0b83d073f254dab178b79fdae00be7b2..a9886fb386b7d7096ae1e51a2d617d08f3e36f9a 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.9-rc0
+DEF_VER=v1.9.4
 
 LF='
 '