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