Merge branch '0.23.x'

Conflicts:
	CHANGES.rst

CHANGES.rst

@@ -45,6 +45,16 @@ Other changes
 -------------
 
 
+0.23.3 (2015-??-??)
+===================
+
+Bugs fixed
+----------
+
+* Incorrect C code in helper functions for PyLong conversion and string
+  decoding.  Original patch by Nikolaus Rath.
+
+
 0.23.2 (2015-09-11)
 ===================
 

docs/src/reference/extension_types.rst

@@ -102,7 +102,7 @@ Properties
 
 * The ``__get__()``, ``__set__()``, and ``__del__()`` methods are all optional.
 
- * If they are omitted, An exception is raised when an access attempt is made.
+ * If they are omitted, an exception is raised on attribute access.
 
 * Below, is a full example that defines a property which can..