merge with 3.3

birkenfeld · birkenfeld · commit 06a70621edfc · 2014-02-24T09:27:16.000+01:00
diff --git 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@v.loewis.de>
 .. sectionauthor:: Martin v. Löwis <martin@v.loewis.de>
 

-Original file line number
+Diff line change
 .. module:: stringprep
    :synopsis: String preparation, as per RFC 3453
 -   :deprecated:
 .. moduleauthor:: Martin v. Löwis <[email protected]>
 .. sectionauthor:: Martin v. Löwis <[email protected]>