[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/6e240b661ab5
changeset:   89358:6e240b661ab5
parent:      89356:a91e50feeac4
parent:      89357:de5d4a60ab95
user:        Georg Brandl <georg at python.org>
date:        Mon Feb 24 09:27:16 2014 +0100
summary:
  merge with 3.3

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


diff --git a/Doc/library/stringprep.rst b/Doc/library/stringprep.rst
--- a/Doc/library/stringprep.rst
+++ b/Doc/library/stringprep.rst
@@ -3,7 +3,6 @@
 
 .. module:: stringprep
    :synopsis: String preparation, as per RFC 3453
-   :deprecated:
 .. moduleauthor:: Martin v. Löwis <martin at v.loewis.de>
 .. sectionauthor:: Martin v. Löwis <martin at v.loewis.de>
 

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