Merge branch 'maint-1.5.5' into maint

diff --git a/git-gui/GIT-VERSION-GEN b/git-gui/GIT-VERSION-GEN
index 9770b0bc27ae4dfd44f4bfcfc74946fabefdc127..0ab478ef90aba9048a2de785d538da16e1bae431 100755 (executable)
--- a/git-gui/GIT-VERSION-GEN
+++ b/git-gui/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=0.8.GITGUI
+DEF_VER=0.10.GITGUI
 
 LF='
 '