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