Merge branch 'maint'

* maint:
Make man page building quiet when DOCBOOK_XSL_172 is defined
git-new-workdir: Share SVN meta data between work dirs and the repository
rev-parse: fix meaning of rev~ vs rev~0.
git-svn: don't blindly append '*' to branch/tags config

diff --cc git-svn.perl
Simple merge

diff --cc sha1_name.c
Simple merge