Merge branch 'maint-2.5' into maint-2.6

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 0e353e80cc731a2fc5b6848bab7b88c5f201a297..7ed482057c78a7aee87205b2aa81e096bd074d51 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.3.10
+DEF_VER=v2.6.5
 
 LF='
 '
@@ -38,5 +38,3 @@ test "$VN" = "$VC" || {
        echo >&2 "GIT_VERSION = $VN"
        echo "GIT_VERSION = $VN" >$GVF
 }
-
-