Merge branch 'maint-1.7.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Jun 2010 01:14:17 +0000 (18:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Jun 2010 01:14:17 +0000 (18:14 -0700)
commit6774e2bf0822cd4358620d3e806f9b3df8bd777e
tree1372d1e4c440020d51dbba94ab6aa8d492eeb9a8
parent811dd906dbb391544085a3a7ca6cfc7b53d33131
parent4b2343fa4125f73a26cb20016a3ae3a27c00dd6f
Merge branch 'maint-1.7.0' into maint

* maint-1.7.0:
  Documentation/config: describe status.submodulesummary
Documentation/config.txt