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

Conflicts: paramiko/config.py tests/test_util.py
2013-02-28 12:51:00 +01:00 · 2013-02-28 12:51:00 +01:00 · 732417bf98
parent 06f9704820 a07a339006
commit 732417bf98
1 changed files with 0 additions and 1 deletions
--- a/paramiko/config.py
+++ b/paramiko/config.py
@ -74,7 +74,6 @@ class LazyFqdn(object):
            self.fqdn = fqdn
        return self.fqdn

-
 class SSHConfig (object):
    """
    Representation of config information as stored in the format used by