From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 24 Sep 2015 10:48:24 +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=997533fc26f8b96f41b8034f3733b078b71f6f2d;p=thirdparty%2Fntp.git

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

bk: 5603d4f80B4mgv4BTD85lxNtB4ku7Q
---

997533fc26f8b96f41b8034f3733b078b71f6f2d