]> source.dussan.org Git - gitignore.git/commitdiff
Merge pull request #187 from bripkens/master
authorChris Wanstrath <chris@ozmm.org>
Thu, 1 Sep 2011 23:34:10 +0000 (16:34 -0700)
committerChris Wanstrath <chris@ozmm.org>
Thu, 1 Sep 2011 23:34:10 +0000 (16:34 -0700)
Ignore additional Netbeans configuration file


Trivial merge