Merge branch 'maint'
tree420f06c14d8b90a472aeea048bc400f1fed6fada
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 11167 Makefile
-rwxr-xr-x 71432 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows