From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 10 Apr 2015 13:22:14 +0000 (+0300)
Subject: Null merge
X-Git-Tag: v3.5.0a4~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ce11d296cee8d71d2bf2451c7dba4ffa119d9d3;p=thirdparty%2FPython%2Fcpython.git

Null merge
---

2ce11d296cee8d71d2bf2451c7dba4ffa119d9d3
diff --cc Doc/library/ssl.rst
index 88d634ee927b,141dcb2c890f..acee4310371d
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@@ -315,6 -315,6 +315,8 @@@ Random generatio
  
     For almost all applications :func:`os.urandom` is preferable.
  
++   For almost all applications :func:`os.urandom` is preferable.
++
     .. versionadded:: 3.3
  
  .. function:: RAND_status()