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

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

bk: 531d8f92chJQJaUYC54BW4fRnIquuw
---

b884bcd3a51ae68aa12c45fc677ad9a68dc059c8