From 70fc36e164e988c251bdaaee7e27c5f6407e0f4c Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Fri, 19 Jun 2015 11:19:00 +0200
Subject: [PATCH] [master] Finished merge of trac3697 (cryptic error on invalid
 config)

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

diff --git a/ChangeLog b/ChangeLog
index 65a163fc43..8a3c04d394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+961.	[func]		fdupont
+	Improved error messages when handling invalid or malformed
+	configuration file. File and line number are printed, when
+	available.
+	(Trac #3697, git xxx)
+
 960.	[build]		fdupont
 	Get rid of the last bundy pieces of code.
 	(Trac #3732, git 6b7da42f902fabb6855e54a19ea472c18ba82a93)
-- 
2.47.3