From: Carl Suster <code@contraflo.ws>
Date: Fri, 21 Mar 2014 01:48:39 +0000 (+1100)
Subject: Merge branch 'fix-921'
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=655e5ba74d5a6d9b712713c7640d97f879f4a7dc;p=gitignore.git

Merge branch 'fix-921'

This is #921 without the addition of editor-specific rules.
---

655e5ba74d5a6d9b712713c7640d97f879f4a7dc