merge 0.21.x branch into master

a62c801d · Stefan Behnel · 0194c111 · 6870ce04 · a62c801d
Commit a62c801d authored Dec 26, 2014 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

CHANGES.rst CHANGES.rst +3 -0

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -56,6 +56,9 @@ Bugs fixed
 * Py3 main code in embedding program code was lacking casts.
+* Exception related to distutils "Distribution" class type in pyximport under
+  latest CPython 2.7 and 3.4 releases when setuptools is being imported later.
 0.21.1 (2014-10-18)
 ===================