merge 3.4

This commit is contained in:
Benjamin Peterson 2014-12-30 15:17:09 -06:00
commit 0396cd7067

View file

@ -414,7 +414,7 @@ FTP_TLS Objects
.. attribute:: FTP_TLS.ssl_version
The SSL version to use (defaults to *TLSv1*).
The SSL version to use (defaults to :attr:`ssl.PROTOCOL_SSLv23`).
.. method:: FTP_TLS.auth()