Merge branch '0.22.x'

Conflicts: CHANGES.rst Cython/Shadow.py

Merge branch '0.22.x'
Conflicts: CHANGES.rst Cython/Shadow.py
6ed5806a · Stefan Behnel · ce2f634f · 146fd20d · 6ed5806a
Commit 6ed5806a authored Jun 20, 2015 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGES.rst CHANGES.rst +2 -1

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -84,7 +84,8 @@ Other changes
 * Changed mangling scheme in header files generated by ``cdef api``
  declarations.

-0.22.1 (2015-05-??)
+
+0.22.1 (2015-06-20)
 ===================

 Bugs fixed