tree a491c1b8644aac729fff4a42a2dfdd3750b81802
parent caea1a2bb52262c64fdef545578ee7c5ceb113c5
parent 03af7cd1580b7a4d9b77c81081d6eabc0338883e
author Junio C Hamano <gitster@pobox.com> 1415823191 -0800
committer Junio C Hamano <gitster@pobox.com> 1415823192 -0800

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

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