Merge branch 'maint-2.5' into maint-2.6

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e1aba8533f5b6d63ac01fb06961843a8f32f75e9..7ed482057c78a7aee87205b2aa81e096bd074d51 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.6.1
+DEF_VER=v2.6.5
 
 LF='
 '