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