From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 25 Sep 2015 07:05:43 +0000 (-0400)
Subject: Merge psp-deb1.ntp.org:ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0adec605d89abcf1465ec5cf95bc5518c3537f6;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:ntp-stable
into  deacon.udel.edu:/deacon/backroom/ntp-stable

bk: 5604f247pbDxBsm6S4lpuPtcGA3vbQ
---

a0adec605d89abcf1465ec5cf95bc5518c3537f6