From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Mar 2011 23:20:49 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc0~63
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af4c62ae88d403a417ba7c2b879eca10e7bff8f4;p=git.git

Merge branch 'maint'

* maint:
  docs: fix grammar in gitattributes.txt
---

af4c62ae88d403a417ba7c2b879eca10e7bff8f4