Merge branch 'da/difftool' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b872b6e7d6e5067b7f080217a66f0b9d45c4931b..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-rc0
+DEF_VER=v2.8.3
 
 LF='
 '