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

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

bk: 5313eabdLh6KTyUip-6SJZJx4Gdvzw
---

c97622f60bb5585a5533bc00524eedec74cbcfc1