Merge branch 'maint'
tree8dc3b020c388cecb38039108ef149bd7a2a40f52
-rw-r--r-- 62 .gitignore
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 5706 Makefile
-rwxr-xr-x 66934 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - po