Merge branch 'js/etc-config'

* js/etc-config:
  Make tests independent of global config files
  config: read system-wide defaults from /etc/gitconfig

diff --cc Documentation/config.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc config.c
Simple merge