Commit 57355526 authored by Robert Bradshaw's avatar Robert Bradshaw

Merge branch '0.20.x'

Conflicts:
	CHANGES.rst
	Cython/Shadow.py
parents 3104c156 192a4c18
...@@ -54,7 +54,7 @@ Other changes ...@@ -54,7 +54,7 @@ Other changes
* Removed support for CPython 2.4, 2.5 and 3.1. * Removed support for CPython 2.4, 2.5 and 3.1.
0.20.2 0.20.2 (2014-06-16)
=================== ===================
Features added Features added
......
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