Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2016 20:32:42 +0000 (13:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2016 20:32:42 +0000 (13:32 -0700)
* maint:
Documentation: fix broken linkgit to git-config
git-compat-util: st_add4: work around gcc 4.2.x compiler crash

Trivial merge