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

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

bk: 5313f2daGsZpRcNcziqriXsIKbp8lA
---

b6ba2d7afb0caab418dab9000331feeaa7f27f1a