Merge branch '1.10' into 1.11

This commit is contained in:
Jeff Forcier 2014-01-30 14:29:16 -08:00
commit 397cd4ce99
2 changed files with 2 additions and 2 deletions

View File

@ -8,4 +8,4 @@ following ways:
* IRC: ``#paramiko`` on Freenode * IRC: ``#paramiko`` on Freenode
* Mailing list: ``paramiko@librelist.com`` (see `the LibreList homepage * Mailing list: ``paramiko@librelist.com`` (see `the LibreList homepage
<http://librelist.com>`_ for usage details). <http://librelist.com>`_ for usage details).
* This website's :doc:`blog </blog>`. * This website - a blog section is forthcoming.

View File

@ -6,7 +6,7 @@ How to get the code
=================== ===================
Our primary Git repository is on Github at `paramiko/paramiko Our primary Git repository is on Github at `paramiko/paramiko
<https://github.com/paramiko/paramiko>`; please follow their instruction for <https://github.com/paramiko/paramiko>`_; please follow their instructions for
cloning to your local system. (If you intend to submit patches/pull requests, cloning to your local system. (If you intend to submit patches/pull requests,
we recommend forking first, then cloning your fork. Github has excellent we recommend forking first, then cloning your fork. Github has excellent
documentation for all this.) documentation for all this.)