Merge branch 'da/difftool' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b5072a28ed488a2d0a1da85d04d7ae93e1a39105..596965a4de6c3d965a6967a2ed94eb79eb762b5f 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.8.0-rc4
+DEF_VER=v2.8.3
 
 LF='
 '