merge with 3.2

e2fb1c65 · Sandro Tosi · 037a87ed · 75bd7a40 · e2fb1c65
Commit e2fb1c65 authored Aug 16, 2011 by Sandro Tosi
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Doc/license.rst Doc/license.rst +1 -1

No files found.
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -875,7 +875,7 @@ zlib
 ----

 The :mod:`zlib` extension is built using an included copy of the zlib
-sources unless the zlib version found on the system is too old to be
+sources if the zlib version found on the system is too old to be
 used for the build::

  Copyright (C) 1995-2011 Jean-loup Gailly and Mark Adler