Merge branch 'wk/doc-clarify-upstream'

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

Junio C Hamano committed Jun 6, 2014 at 11:32 UTC c8704ad33534b40e14c412f36f83f64cfcbf0359

No changes.