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