Merge branch 'cb/http-multi-curl-auth' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index a6b6db79fa569a4d2d3c6bb8769e9636bea962f4..692222afb3f634879408c8d470cdd854b5a3752c 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.9.2
+DEF_VER=v1.7.10.1
 
 LF='
 '
@@ -12,7 +12,7 @@ if test -f version
 then
        VN=$(cat version) || VN="$DEF_VER"
 elif test -d .git -o -f .git &&
-       VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
+       VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) &&
        case "$VN" in
        *$LF*) (exit 1) ;;
        v[0-9]*)