Merge branch 'nd/gitignore-trailing-whitespace' into maint
commit7fa1365c54c28b3cd9375539f381b54061a1880d
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Nov 2014 20:13:11 +0000 (12 12:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Nov 2014 20:13:12 +0000 (12 12:13 -0800)
treea491c1b8644aac729fff4a42a2dfdd3750b81802
parentcaea1a2bb52262c64fdef545578ee7c5ceb113c5
parent03af7cd1580b7a4d9b77c81081d6eabc0338883e
Merge branch 'nd/gitignore-trailing-whitespace' into maint

* nd/gitignore-trailing-whitespace:
  gitignore.txt: fix spelling of "backslash"
Documentation/gitignore.txt