Merge branch 'openssh-compatibility' of github.com:lndbrg/paramiko into openssh-compatibility

Conflicts:
	paramiko/config.py
	tests/test_util.py
This commit is contained in:
Olle Lundberg 2013-02-28 12:51:00 +01:00
commit 732417bf98
1 changed files with 0 additions and 1 deletions

View File

@ -74,7 +74,6 @@ class LazyFqdn(object):
self.fqdn = fqdn self.fqdn = fqdn
return self.fqdn return self.fqdn
class SSHConfig (object): class SSHConfig (object):
""" """
Representation of config information as stored in the format used by Representation of config information as stored in the format used by