Merge branch 'master' into jython
-rw-r--r-- 13 .gitignore
-rwxr-xr-x 354 setup.py
drwxr-xr-x - wrw