Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Mar 2011 23:20:49 +0000 (16:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Mar 2011 23:20:49 +0000 (16:20 -0700)
commitaf4c62ae88d403a417ba7c2b879eca10e7bff8f4
treec891b5836ffd51e72d12ad15fdb8599b214b5dcc
parente2a57aac8a8a2b786739a5a93ea9dcfd2f0fd0e2
parentb547ce0b184f152938f2ea709b9932fa0d6181f8
Merge branch 'maint'

* maint:
  docs: fix grammar in gitattributes.txt