Merge branch 'maint'
tree46919c2c1f136744a05a6854c58b337eac6093c1
-rw-r--r-- 62 .gitignore
-rwxr-xr-x 1814 GIT-VERSION-GEN
-rw-r--r-- 2776 Makefile
-rwxr-xr-x 55655 git-gui.sh
drwxr-xr-x - lib