Commit 510c68d6 authored by Michal Čihař's avatar Michal Čihař

Merge commit 'edc2be6c'

Conflicts:
	setup.py
parents 3e915ec3 edc2be6c
Markdown is supported
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