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