merge with 3.2

2011-08-16 20:03:50 +02:00 · 2011-08-16 20:03:50 +02:00 · b51a3c9d22
parent 6e5222d5f8 f6b25b9e35
commit b51a3c9d22
1 changed files with 1 additions and 1 deletions
--- 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