From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 8 Aug 2014 09:03:13 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P457~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b178b805ad5e068318d2ebd52f96870118c8cb9;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-autogen-5.18.4

bk: 53e49251NoNcXx1ABxhHqT7a4CJUmg
---

4b178b805ad5e068318d2ebd52f96870118c8cb9
diff --cc ChangeLog
index a003ec96b,c4bed5a4f..bef6efaeb
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,6 +1,8 @@@
 +* Fix nits in the ntpq man page.
- * autogen-5.18.4pre9
++* autogen-5.18.4pre12
+ (4.2.7p456) 2014/08/07 Released by Harlan Stenn <stenn@ntp.org>
+ * CID 739722: Change the way the extention and MAC fields are processed.
+ (4.2.7p455) 2014/08/03 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2565] ntpd sometimes logs unexpected getifaddrs() errors.
  * CID 739722: Clean up the definition of the exten field of struct pkt.
  (4.2.7p454) 2014/07/30 Released by Harlan Stenn <stenn@ntp.org>