From: Poul-Henning Kamp <phk@ntp.org>
Date: Sat, 9 Aug 2014 08:18:39 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P457~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fda5080799311800fdaf7d51c14608a590ae99b8;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/phk/ntp-dev

bk: 53e5d95fqPtcXZvB58Lnermi3WFDMw
---

fda5080799311800fdaf7d51c14608a590ae99b8
diff --cc ChangeLog
index 217666586,09a5b048f..78f79dfa7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
+ * Pass the configration source into the parser as argument rather
+   than through a global variable.
 +* Fix nits in the ntpq man page.
 +* autogen-5.18.4pre14
  (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>