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