From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 16 Apr 2014 19:10:09 +0000 (-0700)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P442~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05427d26e934489778b879ceb5c217a11c85d448;p=thirdparty%2Fntp.git

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

bk: 534ed5913-pCWyM5apzFHG1WXmrvZQ
---

05427d26e934489778b879ceb5c217a11c85d448