Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 55e88b02d43e6972fc813ac840cfec39ba555362..520d6e66ec9f14ac1a2dedc84411398d8916ad15 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.10.0.GIT
+DEF_VER=v2.11.0
 
 LF='
 '