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

[benjamin.peterson]

https://hg.python.org/cpython/rev/ce67f965a37d
changeset:   94905:ce67f965a37d
parent:      94903:41ce95a5b2d8
parent:      94904:8264652bce68
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Mar 08 09:42:40 2015 -0400
summary:
  merge 3.4 (#23608)

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


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -556,7 +556,7 @@
    prefer trusted certificates when building the trust chain to validate a
    certificate. This flag is enabled by default.
 
-   .. versionadded:: 3.4.5
+   .. versionadded:: 3.4.4
 
 .. data:: PROTOCOL_SSLv23
 

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