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