]> source.dussan.org Git - gitignore.git/commitdiff
Merge remote-tracking branch 'matzew/master' (pull request #418)
authorJustin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Tue, 2 Jul 2013 20:09:57 +0000 (13:09 -0700)
committerJustin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Tue, 2 Jul 2013 20:09:57 +0000 (13:09 -0700)

Trivial merge