Merge branch 'wk/doc-clarify-upstream'
authorJunio C Hamano <redacted>
Fri, 6 Jun 2014 18:32:13 +0000 (11:32 -0700)
committerJunio C Hamano <redacted>
Fri, 6 Jun 2014 18:32:14 +0000 (11:32 -0700)
* wk/doc-clarify-upstream:
  Documentation: mention config sources for @{upstream}


Trivial merge
git clone https://git.99rst.org/PROJECT