Merge branch '1.7'

Conflicts: ssh/__init__.py
2011-11-18 08:58:39 -08:00 · 2011-11-18 08:58:39 -08:00 · 1dba29a037
parent b494bb3952 9234baed01
commit 1dba29a037
1 changed files with 1 additions and 3 deletions
--- a/setup.py
+++ b/setup.py
@ -49,10 +49,8 @@ if sys.platform == 'darwin':
 	setup_helper.install_custom_make_tarball()


-import ssh
-
 setup(name = "ssh",
-      version = ssh.__version__,
+      version = "1.8.0a0",
      description = "SSH2 protocol library",
      author = "Jeff Forcier",
      author_email = "jeff@bitprophet.org",