merge 0.21.x branch into master

109400d2 · Stefan Behnel · 8ba8cf68 · 9262e55c · 109400d2
Commit 109400d2 authored Oct 14, 2014 by Stefan Behnel
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

CHANGES.rst CHANGES.rst +6 -5

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -55,12 +55,13 @@ Bugs fixed
 Other changes
 -------------
-* The new ``posix.time`` declarations (added in 0.21) was split up to provide
+* The new ``posix.time`` declarations module (added in 0.21) was split up
-  a more widely available ``libc.time`` part.  Patch by Charles Blake.
+  to provide a more widely available ``libc.time`` part.  Patch by Charles
+  Blake.
-* Compilation no longer fails hard when unknown compilation options are passed.
+* Compilation no longer fails hard when unknown compilation options are
-  Instead, it raises a warning and ignores them (as it did silently before 0.21).
+  passed.  Instead, it raises a warning and ignores them (as it did silently
-  This will be changed back to an error in a future release.
+  before 0.21).  This will be changed back to an error in a future release.
 0.21 (2014-09-10)