Merge branch 'maint'
tree9703c203a5a6006bc4c0ccb2a19ccda1cfd807b5
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11322 Makefile
-rwxr-xr-x 75536 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows