Merge branch 'nd/gitignore-trailing-whitespace' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Nov 2014 20:13:11 +0000 (12:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Nov 2014 20:13:12 +0000 (12:13 -0800)
* nd/gitignore-trailing-whitespace:
gitignore.txt: fix spelling of "backslash"

1  2 
Documentation/gitignore.txt
Simple merge