| commit | b51a3c9d22e2ed9f56b9afd003e5a408d5e7dad0 | [log] [tgz] |
|---|---|---|
| author | Sandro Tosi <sandro.tosi@gmail.com> | Tue Aug 16 20:03:50 2011 +0200 |
| committer | Sandro Tosi <sandro.tosi@gmail.com> | Tue Aug 16 20:03:50 2011 +0200 |
| tree | 6eaa68aba02a0612a73d9cf7fa216719ccdc44fd | |
| parent | 6e5222d5f87b5e34a1d039f86e5e71d89419cdc1 [diff] | |
| parent | f6b25b9e357a6324118cb80cf84cd7f84d6fd5f7 [diff] |
merge with 3.2
diff --git a/Doc/license.rst b/Doc/license.rst index d0b370f..9119f18 100644 --- a/Doc/license.rst +++ b/Doc/license.rst
@@ -875,7 +875,7 @@ ---- 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