]> source.dussan.org Git - gitignore.git/commitdiff
Merge branch 'fix-956'
authorCarl Suster <carl@contraflo.ws>
Fri, 4 Apr 2014 06:21:22 +0000 (17:21 +1100)
committerCarl Suster <carl@contraflo.ws>
Fri, 4 Apr 2014 06:21:22 +0000 (17:21 +1100)

Trivial merge