Merge branch 'maint'
treebe98c471b734ea01e53326a1f99b5dcbe7d6970b
-rw-r--r-- 62 .gitignore
-rwxr-xr-x 1814 GIT-VERSION-GEN
-rw-r--r-- 3593 Makefile
-rwxr-xr-x 58078 git-gui.sh
drwxr-xr-x - lib