Skip to content
Commit 2a59d9a7 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' into bryan-merge 

Conflicts:
	setup.py
parents 7e1dc40d a065ea0b
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