Merge branch 'pb/remote-mirror-config'

* pb/remote-mirror-config:
  Add a remote.*.mirror configuration option

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-push.txt
Simple merge

diff --cc builtin-remote.c
Simple merge

diff --cc remote.c
Simple merge