[Python-checkins] cpython (merge default -> default): Merge heads.

[ezio.melotti]

http://hg.python.org/cpython/rev/2159ff4595b7
changeset:   79947:2159ff4595b7
parent:      79944:3074ce015cc6
parent:      79946:f2f615b5718a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Oct 26 19:35:00 2012 +0300
summary:
  Merge heads.

files:
  Doc/tutorial/stdlib.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -203,7 +203,7 @@
 ================
 
 Common data archiving and compression formats are directly supported by modules
-including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`zipfile` and
+including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`lzma`, :mod:`zipfile` and
 :mod:`tarfile`. ::
 
    >>> import zlib

-- 
Repository URL: http://hg.python.org/cpython