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