Merge branch 'maint' of git://git.spearce.org/git-gui into maint