[master] Finished merge of trac3697 (cryptic error on invalid config)

diff --git a/ChangeLog b/ChangeLog
index 65a163fc43ea1dbd8c41b109c5ee20a29b28ba8f..8a3c04d394101c145b2c7692f8aac672420e4929 100644 (file)
--- 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)