]> source.dussan.org Git - gitignore.git/commitdiff
Merge pull request #293 from adericbourg/master
authorChris Wanstrath <chris@ozmm.org>
Wed, 18 Apr 2012 19:05:07 +0000 (12:05 -0700)
committerChris Wanstrath <chris@ozmm.org>
Wed, 18 Apr 2012 19:05:07 +0000 (12:05 -0700)
C


Trivial merge