Merge branch 'maint'
tree60723fb7c6a4e0d79ebc74ba923eae592393de71
-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