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)
* maint-1.7.0:
Documentation/config: describe status.submodulesummary

1  2 
Documentation/config.txt
Simple merge