Merge branch '1.10' into 1.11

This commit is contained in:
Jeff Forcier 2014-03-04 15:54:16 -08:00
commit 8f22672926
1 changed files with 1 additions and 1 deletions

View File

@ -4,7 +4,7 @@ Welcome to Paramiko's documentation!
This site covers Paramiko's usage & API documentation. For basic info on what This site covers Paramiko's usage & API documentation. For basic info on what
Paramiko is, including its public changelog & how the project is maintained, Paramiko is, including its public changelog & how the project is maintained,
please see `the main website <http://paramiko.org>`_. please see `the main project website <http://paramiko.org>`_.
API documentation API documentation