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