From f99a01bf3028bd460db50ac57e040176f7ddf295 Mon Sep 17 00:00:00 2001
From: Bob Halley <halley@dnspython.org>
Date: Fri, 13 May 2016 06:44:37 -0700
Subject: [PATCH] Update with recent changes

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

diff --git a/ChangeLog b/ChangeLog
index 177a34cf..6cda9e79 100644
--- 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)
-- 
2.47.3