From 111e59a01fae5e4259cbc674d4bfb805a75ab951 Mon Sep 17 00:00:00 2001
From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 6 Jul 2017 09:31:04 -0400
Subject: [PATCH] [master] added ChangeLog entry 1270 for 5325.

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

diff --git a/ChangeLog b/ChangeLog
index cddda3fbbd..0790f4f236 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1270.	[bug]		tmark
+	Added a distribution rule to src/bin/d2/Makefile.am so
+	d2_parser.yy will now be included in the distribution source
+	tree. Also added entries for missing headers to asiolink/
+	Makefile.am.
+	(Trac #5325, git 199003d7aa9f8d4a7f8daa73f8259e951bc03217)
+
 1269.	[func]		marcin
 	Command manager can now handle large responses to control
 	commands. Prior to this change the size of the response
-- 
2.47.2