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