From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 4 Mar 2014 08:12:11 +0000 (-0800)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P442~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a1ff8eb143e61d389974c74d8d392aaadf113b;p=thirdparty%2Fntp.git

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

bk: 53158adbsxRMTFTdJFFXL4Vv-kOKoQ
---

f4a1ff8eb143e61d389974c74d8d392aaadf113b