Merge branch 'maint'
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 4756 Makefile
-rwxr-xr-x 58326 git-gui.sh
drwxr-xr-x - lib