Merge branch '0.20.x'

Conflicts: CHANGES.rst Cython/Shadow.py

Merge branch '0.20.x'
Conflicts: CHANGES.rst Cython/Shadow.py
57355526 · Robert Bradshaw · 3104c156 · 192a4c18 · 57355526
Commit 57355526 authored Jun 16, 2014 by Robert Bradshaw
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CHANGES.rst CHANGES.rst +1 -1

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -54,7 +54,7 @@ Other changes
 * Removed support for CPython 2.4, 2.5 and 3.1.


-0.20.2
+0.20.2 (2014-06-16)
 ===================

 Features added