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