Merge branch 'maint'
treecc25debce76b3b1d8120ca44ea954df29a1685ed
-rw-r--r-- 62 .gitignore
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 5695 Makefile
-rwxr-xr-x 66802 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - po