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