Merge branch '0.23.x'

Conflicts:
	CHANGES.rst

CHANGES.rst

@@ -34,6 +34,16 @@ Other changes
 -------------
 
 
+0.23.2 (2015-0x-yy)
+===================
+
+Bugs fixed
+----------
+
+* Invalid C code when caching known builtin methods.
+  This fixes ticket 860.
+
+
 0.23.1 (2015-08-22)
 ===================
 

Cython/Utility/ObjectHandling.c

@@ -1106,8 +1106,10 @@ static CYTHON_INLINE int __Pyx_PyObject_SetAttrStr(PyObject* obj, PyObject* attr
 typedef struct {
     PyObject *type;
     PyObject **method_name;
-    PyCFunction func;   // set on first access (direct C function pointer)
-    PyObject *method;   // set on first access (fallback)
+    // "func" is set on first access (direct C function pointer)
+    PyCFunction func;
+    // "method" is set on first access (fallback)
+    PyObject *method;
     int flag;
 } __Pyx_CachedCFunction;