From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 13 Oct 2013 09:27:19 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P394~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86c67a9823489de7a5814d3813842ea1a8cdee4e;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-2256

bk: 525a6777jhmUN6SFt1uN_lT-q-8tLg
---

86c67a9823489de7a5814d3813842ea1a8cdee4e