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

diff --cc ChangeLog
index a003ec96b7f125f48c2be25bf190cd70fb4f865e,c4bed5a4fb343777bf42df35c2ec9ec26203e872..bef6efaeb3cea89c269ea565fe0439c96ce6853c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,6 +1,8 @@@
- * autogen-5.18.4pre9
 +* Fix nits in the ntpq man page.
++* 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>

diff --cc scripts/calc_tickadj/calc_tickadj.html
Simple merge

diff --cc scripts/ntpsweep/ntpsweep.html
Simple merge

diff --cc scripts/ntptrace/ntptrace.html
Simple merge

diff --cc scripts/plot_summary.html
Simple merge

diff --cc scripts/summary.html
Simple merge