Merge remote-tracking branch 'upstream/master'

This commit is contained in:
C Nelson 2012-04-17 20:38:35 -05:00
commit dac0a54deb

View File

@ -1,5 +1,3 @@
syntax: glob
#precompiled python
*.pyc