Update with recent changes

diff --git a/ChangeLog b/ChangeLog
index 177a34cf70a66afd7eef593c4c630177d8380587..6cda9e79271fc8e8d8a64002b0e81feff88699f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-05-13  Bob Halley  <halley@dnspython.org>
+
+       * dns/message.py (make_query): Setting any value which implies
+         EDNS will turn on EDNS if 'use_edns' has not been specified.
+
+2016-05-12  Bob Halley  <halley@dnspython.org>
+
+       * TSIG signature algorithm setting was broken by the Python 2
+         and Python 3 code line merge.  Fixed.
+
 2016-05-10  Bob Halley  <halley@dnspython.org>
 
        * (Version 1.13.0 released)