Merge branch 'maint'
tree5311d73afda755744ba1bd290764c814f3179b9d
-rw-r--r-- 86 .gitignore
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 9586 Makefile
-rwxr-xr-x 68729 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po