Merge branch 'master' into next
commit53f96473e1e62d65c797371cc5d47dd509f0f8b3
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Mar 2011 23:20:59 +0000 (18 16:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Mar 2011 23:20:59 +0000 (18 16:20 -0700)
treecaf58789ee29e0e32724edc9c7855fc050c966f4
parenta32016be06daadfebed447c46b98041d71b428fc
parentaf4c62ae88d403a417ba7c2b879eca10e7bff8f4
Merge branch 'master' into next

* master:
  docs: fix grammar in gitattributes.txt