Merge branch 'jk/notes-dwim-doc' into maint

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