Merge branch 'master' into devel

Browse source

Conflicts:
	setup.py

...

This commit is contained in:

Gina Häußge 2014-06-22 00:55:18 +02:00

parent 285f464b43 f9a9a405cd

commit 12a4cbef46

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available