diff options
author | Sebastian Deiss <sdeiss@haw-landshut.de> | 2014-04-07 17:37:37 +0200 |
---|---|---|
committer | Sebastian Deiss <sdeiss@haw-landshut.de> | 2014-04-07 17:37:37 +0200 |
commit | 550f0b99eadf8a366253046acdd944709214123f (patch) | |
tree | 858e8a5a89a93b099f4282da4e67ae446325a3ac /sites/www/changelog.rst | |
parent | 8e3561b5b123a993b7f19d0b1ce5c5e67e370cbc (diff) | |
parent | 57e647341f416c879ae3841c9a7be50c52a21327 (diff) |
Merge branch 'paramiko:master' into gssapi-py3-support
Conflicts:
dev-requirements.txt
Diffstat (limited to 'sites/www/changelog.rst')
-rw-r--r-- | sites/www/changelog.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 5b221e90..7ac09abd 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -16,7 +16,8 @@ Changelog * :release:`1.11.5 <2014-03-13>` * :release:`1.10.7 <2014-03-13>` * :feature:`16` **Python 3 support!** Our test suite passes under Python 3, and - it (& Fabric's test suite) continues to pass under Python 2. + it (& Fabric's test suite) continues to pass under Python 2. **Python 2.5 is + no longer supported with this change!** The merged code was built on many contributors' efforts, both code & feedback. In no particular order, we thank Daniel Goertzen, Ivan Kolodyazhny, |