Please remerge git-gui.git into git.git

Currently the tree between git-gui.git and git.git:git-gui does
not match, due to a6080a0a44d5ead84db3dabbbc80e82df838533d, aka the
"War on whitespace".

I really want the git-gui tree in git.git to always match the tree
of the 2nd parent of the merge commit, as that is how git-gui's
own GIT-VERSION-GEN script finds the git-gui commit DAG and gets
git-describe to produce a git-gui specific version number, rather
than the git.git version number.

Right now that script is barfing and coming up with "0.8.GITGUI",
which isn't a valid version number, and means nothing to everyone.

So new `maint` and `master` branches are in git-gui.git.

Thanks!  ;-)

-- 
Shawn.