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

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

bk: 53145a04ho0_qKY29eE2eQs_acolqA
---

a959b58262d2fd2d4b3f59cffa3638bc96d09c7a