Merge tag 'v2.10.4' into maint-2.11

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 706946c7cd400c50ba93440b7094166d7ada16b4..d207f15fb0646f4b967d0d989de0b1d05afc53a2 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.11.1
+DEF_VER=v2.11.2
 
 LF='
 '