Merge branch 'jc/maint-log-grep-all-match-1' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4c1a79e3b26d332651dc0c22a4442e2962f3059a..c4220a09de9d3365a7d36a0ee85964c40f2d2c37 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.12-rc1
+DEF_VER=v1.7.12.1
 
 LF='
 '