From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 23 Mar 2016 07:35:49 +0000 (-0700)
Subject: Merge stenn@psp-deb1.ntp.org:ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ad6dda196e468f1e1eb439da46382e5368efc9;p=thirdparty%2Fntp.git

Merge stenn@psp-deb1.ntp.org:ntp-stable
into  max.pfcs.com:/usr/home/harlan/ntp-stable

bk: 56f24755KV0dqWcBpyjMRM3ldNk9TA
---

f1ad6dda196e468f1e1eb439da46382e5368efc9