Merge branch '1.7'

Conflicts:
	ssh/__init__.py
This commit is contained in:
Jeff Forcier 2011-11-18 08:58:39 -08:00
commit 1dba29a037
1 changed files with 1 additions and 3 deletions

View File

@ -49,10 +49,8 @@ if sys.platform == 'darwin':
setup_helper.install_custom_make_tarball() setup_helper.install_custom_make_tarball()
import ssh
setup(name = "ssh", setup(name = "ssh",
version = ssh.__version__, version = "1.8.0a0",
description = "SSH2 protocol library", description = "SSH2 protocol library",
author = "Jeff Forcier", author = "Jeff Forcier",
author_email = "jeff@bitprophet.org", author_email = "jeff@bitprophet.org",