Merge branch 'jc/mergetool-tool-help' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index a1f935e2b70d7b7805bf4832046356259551235f..a9dea5c023d8b0d98ba877ab0f0a1caed4b3505a 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.11-rc2
+DEF_VER=v1.7.11.4
 
 LF='
 '