Merge cleanup

bk: 54f1a826GDDZuQa12NcQuaMQx3iz8A

diff --git a/ChangeLog b/ChangeLog
index dff384602d58eac25c9275e50f0c048d36d6bf08..64a7e974492a533284f9707a8cbd5290b445ca23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Below are from 4.2.8p2:
 * [Bug 2757] Quiet compiler warnings.
 * [Bug 2759] Expose nonvolatile/clk_wander_threshold to ntpq.
 * [Bug 2766] ntp-keygen output files should not be world-readable.
+* [Bug 2767] ntp-keygen -M should symlink to ntp.keys.
 (4.3.2) 2015/02/25 Released by Harlan Stenn <stenn@ntp.org>
 (4.3.1) 2015/02/21 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p2: