Merge branch 'maint'
-rwxr-xr-x 1814 GIT-VERSION-GEN
-rw-r--r-- 1612 Makefile
-rwxr-xr-x 149034 git-gui.sh