]> source.dussan.org Git - gitignore.git/commitdiff
Merge branch 'fix-1165'
authorCarl Suster <carl@contraflo.ws>
Mon, 1 Sep 2014 04:58:35 +0000 (14:58 +1000)
committerCarl Suster <carl@contraflo.ws>
Mon, 1 Sep 2014 04:58:35 +0000 (14:58 +1000)

Trivial merge