diff options
| author | Matthias Witte <m.witte@telekom.de> | 2014-11-25 18:15:16 +0100 |
|---|---|---|
| committer | Matthias Witte <m.witte@telekom.de> | 2014-11-25 18:15:16 +0100 |
| commit | b3b0f2d0dff3aef736128935302aeb6adb1ee020 (patch) | |
| tree | 16d9fe959aede76a0a6ed4d1a6e59a90198dc6f8 /paramiko/kex_gex.py | |
| parent | 47da1935dc84784bfee2e493474232bf2e0d8d37 (diff) | |
| parent | 838ab5b23274ddea0b5671b7f2d5a295dcd02dfe (diff) | |
| download | paramiko-b3b0f2d0dff3aef736128935302aeb6adb1ee020.tar.gz | |
Merge upstream branch 'master' into add_sha2_support
Conflicts:
paramiko/transport.py
tests/test_transport.py
Diffstat (limited to 'paramiko/kex_gex.py')
| -rw-r--r-- | paramiko/kex_gex.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/kex_gex.py b/paramiko/kex_gex.py index 1eadba03..c980b690 100644 --- a/paramiko/kex_gex.py +++ b/paramiko/kex_gex.py @@ -19,7 +19,7 @@ """ Variant on `KexGroup1 <paramiko.kex_group1.KexGroup1>` where the prime "p" and generator "g" are provided by the server. A bit more work is required on the -client side, and a B{lot} more on the server side. +client side, and a **lot** more on the server side. """ import os |