From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 24 Sep 2015 05:49:18 +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=9a5c93bee944284dd563a666cc8b04a120f2ef40;p=thirdparty%2Fntp.git

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

bk: 56038edeZgJVWgvty9c0vlBSrL3qXg
---

9a5c93bee944284dd563a666cc8b04a120f2ef40