Merge branch 'master' into 1.5

This commit is contained in:
Julien Duponchelle committed 2016-01-20 17:10:59 +01:00
commit c280fd5fb8
12 files changed
+48 -16

No files matched your search

+3
View File
@@ -1,5 +1,8 @@
*.py[cod]
#py.test
.cache
# C extensions
*.so