merge 0.21.x branch into master

bf9979f8 · Stefan Behnel · 841a9f5f · 9b1d6e2a · bf9979f8
Commit bf9979f8 authored Oct 14, 2014 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

CHANGES.rst CHANGES.rst +2 -2

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -28,6 +28,8 @@ Features added
 * ``PySlice_*()`` C-API functions are available from the ``cpython.slice``
  module.
+* Allow arrays of C++ classes.
 Bugs fixed
 ----------
@@ -51,8 +53,6 @@ Bugs fixed
  if the already created module was used later on (e.g. through a
  stale reference in sys.modules or elsewhere).
-* Allow arrays of C++ classes.
 Other changes
 -------------