Merge branch 'wk/doc-clarify-upstream'
commitc8704ad33534b40e14c412f36f83f64cfcbf0359
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:32:13 +0000 (6 11:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:32:14 +0000 (6 11:32 -0700)
tree8da38da2933fea79f3ca4ef8a550f0e6e38339be
parent334d40e951fa3b3961135b3183633706d976c4bd
parent670a7297c2afe4de387cb208fddc90f0f59df6aa
Merge branch 'wk/doc-clarify-upstream'

* wk/doc-clarify-upstream:
  Documentation: mention config sources for @{upstream}