diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2011-11-17 17:44:00 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2011-11-17 17:44:00 -0800 |
| commit | b494bb3952c07eabac5d07280387f5aa8797a18a (patch) | |
| tree | 11483a000316144804544cf30e3aa1fc8014a1c3 | |
| parent | 59cae8560bc338623194724b60451d21dde2fc33 (diff) | |
| parent | 175075e045310cb5d06814fac7ffdfaafc0c7283 (diff) | |
| download | paramiko-b494bb3952c07eabac5d07280387f5aa8797a18a.tar.gz | |
Merge branch '1.7'
Conflicts:
setup.py
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ are supported. SFTP client and server mode are both supported too. Required packages: pyCrypto -To install the `in-development version <https://github.com/bitprophet/ssh/tarball/master#egg=ssh-dev>`, use `pip install ssh==dev`. +To install the `in-development version <https://github.com/bitprophet/ssh/tarball/master#egg=ssh-dev>`_, use `pip install ssh==dev`. ''' # if someday we want to *require* setuptools, uncomment this: |