diff options
| author | Matthias Witte <m.witte@telekom.de> | 2014-07-15 13:16:04 +0200 |
|---|---|---|
| committer | Matthias Witte <m.witte@telekom.de> | 2014-07-15 13:16:04 +0200 |
| commit | f41cb94d5b0e5d9bfc75933b4cee90f644bc0030 (patch) | |
| tree | 3df1d1287f5d7227b2becacc25e2ef9acf6c13d9 | |
| parent | f4cfd1967a1b9d15262ab859d392b3edef512ad7 (diff) | |
| parent | bd21af3405a3591dcc0533993d587aa2e4db0c4f (diff) | |
Merge branch 'add_sha2_support' of github.com:zamiam69/paramiko into add_sha2_support
Conflicts:
paramiko/transport.py
0 files changed, 0 insertions, 0 deletions