Merge branch 'jk/cvsimport-quoting' into maint-2.10

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1ca5c0e366f0cc36264bd63fae98fce6f454e7d6..f0b293d4ff2102b9f96581fe0e7825c679d930a5 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-rc2
+DEF_VER=v2.10.4
 
 LF='
 '