Merge branch 'ss/pull-rebase-preserve' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 50078659fcec88359310e9db691ed6b2ae9ade0e..9905751fc2406d135ee2f855e3d9f9897f95da84 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.3.2
+DEF_VER=v2.3.4
 
 LF='
 '