Merge branch 'paramiko:master' into gssapi-py3-support

Conflicts:
	sites/www/changelog.rst
	test.py

1 files changed, 3 insertions, 3 deletions

diff --git a/test.py b/test.py
index d0da40dc..3bdfed0f 100755
--- a/test.py
+++ b/test.py
@@ -126,12 +126,12 @@ def main():
     parser.add_option('--server_mode', action='store_true', dest='server_mode', default=False,
                       help='Usage with --gssapi-test. Test the available GSS-API / SSPI server mode to.\
                       Note: you need to have access to the kerberos keytab file.')
-    
+
     options, args = parser.parse_args()
-    
+
     # setup logging
     paramiko.util.log_to_file('test.log')
-    
+
     if options.use_sftp:
         from tests.test_sftp import SFTPTest
         if options.use_loopback_sftp: