Merge branch 'maint'
tree77b9694b737de66e995a726b404f0a0ee7969067
-rw-r--r-- 62 .gitignore
-rwxr-xr-x 1814 GIT-VERSION-GEN
-rw-r--r-- 3760 Makefile
-rwxr-xr-x 57798 git-gui.sh
drwxr-xr-x - lib