ChangeLog:

  merge cleanup

bk: 49ec1581U6MzgMFSc8epg-fldMngYg

diff --git a/ChangeLog b/ChangeLog
index 0369d2ad6087cbba37dc0b61966f5d7c5b811d83..a97e5b9797285f2ea69b4563df6840dab8af66bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,6 @@
 * [Bug 1152] temporarily disable refclock_parse, refclock_true until
   maintainers can repair build break from pps_sample()
 * [Bug 1153] refclock_nmea should not mix UTC with GPS time
-* [Bug 1157] quiet OpenSSL warnings, clean up configure.ac
-* [Bug 1158] support for aix6.1
 * [Bug 1159] ntpq overlap diagnostic message test buggy
 (4.2.5p163) 2009/04/10 Released by Harlan Stenn <stenn@ntp.org>
 (4.2.5p162) 2009/04/09 Released by Harlan Stenn <stenn@ntp.org>
@@ -231,8 +229,8 @@
 * [Bug 980] Direct help to stdout.
 ---
 
-* [Bug 1158] support for aix6.1
 * [Bug 1157] quiet OpenSSL warnings, clean up configure.ac
+* [Bug 1158] support for aix6.1
 * [Bug 1160] MacOS X is like BSD regarding F_SETOWN
 
 ---