From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 15 Oct 2013 10:15:35 +0000 (-0700)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P392~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=744aeb03d80e582d4ac40e8979322eb4b30fb520;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  hms-mbp11.local:/Users/harlan/src/ntp-dev-dlm

bk: 525d15c7tJZqJT461Ym-YrY6bgGcPQ
---

744aeb03d80e582d4ac40e8979322eb4b30fb520