[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#23167)

[benjamin.peterson]

https://hg.python.org/cpython/rev/826831a9a376
changeset:   94023:826831a9a376
parent:      94021:8c4fb312e15d
parent:      94022:8ac23d3242b4
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Jan 04 16:30:13 2015 -0600
summary:
  merge 3.4 (#23167)

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


diff --git a/Doc/library/marshal.rst b/Doc/library/marshal.rst
--- a/Doc/library/marshal.rst
+++ b/Doc/library/marshal.rst
@@ -106,7 +106,7 @@
    format, version 1 shares interned strings and version 2 uses a binary format
    for floating point numbers.
    Version 3 adds support for object instancing and recursion.
-   The current version is 3.
+   The current version is 4.
 
 
 .. rubric:: Footnotes

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