]> source.dussan.org Git - gitignore.git/commitdiff
Merge pull request #1493 from gsnedders/jython-python
authorCarl Suster <carl@contraflo.ws>
Thu, 30 Apr 2015 00:17:51 +0000 (10:17 +1000)
committerCarl Suster <carl@contraflo.ws>
Thu, 30 Apr 2015 00:17:51 +0000 (10:17 +1000)
Merge the two Python ignore files


Trivial merge