merge master

5c591b98 · Jason Madden · 9202e0c1 · db7b3671 · 5c591b98
Commit 5c591b98 authored Mar 11, 2016 by Jason Madden
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

changelog.rst changelog.rst +1 -1

No files found.
--- a/changelog.rst
+++ b/changelog.rst
@@ -7,7 +7,7 @@
 1.2a1 (unreleased)
 ==================
- Remove support for Python 2.6.
+- Remove support for Python 2.6. See :pr:`766`.
 - Update libev to version 4.22.
 - Update tblib to 1.3.0.
 - Update c-ares to version 1.11.0 (`release notes <https://raw.githubusercontent.com/c-ares/c-ares/cares-1_11_0/RELEASE-NOTES>`_).