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

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

bk: 53141d811IDw1xjsvx_2Q4UziTghng
---

1ab2d9ae3936a898ff75ad7a5b17b4420b66c95b