Skip to content
Commit 0f89c369 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' into cffi 

Conflicts:
	setup.py
parents 97103453 aaf35ede
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment