From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 25 Sep 2015 04:35:25 +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=9e1d38e908d5dfb8af19cb7834ac2bdb71de95c2;p=thirdparty%2Fntp.git

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

bk: 5604cf0dueTUruC9FfX83k7oRYjaQg
---

9e1d38e908d5dfb8af19cb7834ac2bdb71de95c2