Merge branch 'maint-1.8.5' into maint-1.9

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ccec5effb152aba2c4895710d855cb5cf57990d9..b32d9314f74a109270c12d97eafe7180e5e4fdd6 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.5.4
+DEF_VER=v1.9.5
 
 LF='
 '