Merge branch 'master' of git://github.com/tadman/net-sftp into tadman/master

Author: jamis

lib/net/sftp.rb

@@ -40,8 +40,8 @@ def self.start(host, user, options={}, &block)
       sftp
     rescue Object => anything
       begin
-        session and session.shutdown!
-      rescue Exception
+        session.shutdown!
+      rescue ::Exception
         # swallow exceptions that occur while trying to shutdown
       end