Merge branch 'maint'
treea6a70c5ff1ec67f8ade79358eb4b1cf752e6311a
-rw-r--r-- 36 .gitignore
-rwxr-xr-x 1814 GIT-VERSION-GEN
-rw-r--r-- 1751 Makefile
-rwxr-xr-x 150844 git-gui.sh