Merge branch 'maint'

* maint:
unquote_c_style: fix off-by-one.
test-lib: fix TERM to dumb for test repeatability
config.txt: refer to --upload-pack and --receive-pack instead of --exec
git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails

diff --cc Documentation/config.txt
Simple merge

diff --cc t/test-lib.sh
Simple merge