Commit Graph

1 Commits

Author SHA1 Message Date
JC Brand
04912c5c5a Merge branch 'master' into amd-strophe
Conflicts:
	docs/CHANGES.rst
2015-02-22 12:53:18 +01:00