Merge branch 'nd/gitignore-trailing-whitespace' into maint

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

Junio C Hamano committed Nov 12, 2014 at 12:13 UTC 7fa1365c54c28b3cd9375539f381b54061a1880d

No changes.