From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 24 Sep 2015 11:28: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=af47df6ae0c21b9fef3a2beae3f63538357fd7c7;p=thirdparty%2Fntp.git

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

bk: 5603de591UaSGTRvrVqk0agsz7YODw
---

af47df6ae0c21b9fef3a2beae3f63538357fd7c7