Merge branch '1.12' into 1.13

fabric · Apr 24, 2017 · 9b34c54 · 9b34c54
2 parents 46f3c7c + ca3d46e
commit 9b34c54
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :support:`1416 backported` Add explicit "Python 2 only" note to ``setup.py``
+  trove classifiers to help signal that fact to various info-gathering tools.
+  Patch courtesy of Gavin Bisesi.
 * :bug:`1526` Disable use of PTY and shell for a background command execution
   within `contrib.sed <fabric.contrib.files.sed>`, preventing a small class of
   issues on some platforms/environments. Thanks to ``@doflink`` for the report