Merge branch 'maint'
treee40d9ae21a315f3b7b8785856e10b15d848e02f9
-rw-r--r-- 62 .gitignore
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 4754 Makefile
-rwxr-xr-x 58300 git-gui.sh
drwxr-xr-x - lib