From 36da46861b5fe6ce6939f2f46e9f63e2edd5cd7a Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Sat, 16 Jun 2018 17:31:55 -0400
Subject: [PATCH] Add ChangeLog entries for Daniel Hahler's fixes

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 13feca3..ac2a7d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
       zero length lines and adding a blank line and adding an exra cr/lf for
       lines near max length (LP: #1717576)
       - Thanks to Christian Jørgensen and John Levine for reporting the issue
+    - Add testing extras option to setup.py (Daniel Hahler)
+    - Fix deprecation warnings in test asserts (Daniel Hahler)
+    - Correctly limit try/except for imports to import errors (Daniel Hahler)
 
 2018-05-18 Version 0.8.0
     - Change from distutils to setuptools with entry points because it's the