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