summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-28 19:57:35 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-28 19:57:35 -0700
commitcbe2d93b816a1a0902c4e3e8fd045646ced55bfa (patch)
treeab540f74d6c34a68959602d9e2bbca5472a9ab68
parentb3bdade55f1b5a399e0561ce1b6f25ab6bb4ac52 (diff)
parent399c2cb287950b9802399a9f579a30e10a4db914 (diff)
Merge branch '1.17'
-rw-r--r--sites/www/changelog.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index d19e55cd..c5aeb48e 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -51,9 +51,9 @@ Changelog
* :support:`729 backported (>=1.15,<2.0)` Clean up ``setup.py`` to always use
``setuptools``, not doing so was a historical artifact from bygone days.
Thanks to Alex Gaynor.
-* :bug:`649 (==1.17)` Update the module in charge of handling SSH moduli so
- it's consistent with OpenSSH behavior re: prime number selection. Thanks to
- Damien Tournoud for catch & patch.
+* :bug:`649 major (==1.17)` Update the module in charge of handling SSH moduli
+ so it's consistent with OpenSSH behavior re: prime number selection. Thanks
+ to Damien Tournoud for catch & patch.
* :bug:`617` (aka `fabric/fabric#1429
<https://github.com/fabric/fabric/issues/1429>`_; via :issue:`679`; related:
:issue:`678`, :issue:`685`, :issue:`615` & :issue:`616`) Fix up