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

[benjamin.peterson]

http://hg.python.org/cpython/rev/6be54158e935
changeset:   91810:6be54158e935
parent:      91808:7d891572e361
parent:      91809:a5a80f79699e
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Jul 23 21:39:59 2014 -0700
summary:
  merge 3.4 (#22036)

files:
  Objects/stringlib/README.txt |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/stringlib/README.txt b/Objects/stringlib/README.txt
--- a/Objects/stringlib/README.txt
+++ b/Objects/stringlib/README.txt
@@ -1,4 +1,4 @@
-bits shared by the stringobject and unicodeobject implementations (and
+bits shared by the bytesobject and unicodeobject implementations (and
 possibly other modules, in a not too distant future).
 
 the stuff in here is included into relevant places; see the individual

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