Merge branch '1.7'

Conflicts:
	setup.py
This commit is contained in:
Jeff Forcier 2011-11-17 17:44:00 -08:00
commit b494bb3952
1 changed files with 1 additions and 1 deletions

View File

@ -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: