From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 26 Apr 2015 00:00:40 +0000 (-0400)
Subject: Merge psp-deb1.ntp.org:ntp-stable
X-Git-Tag: NTP_4_3_20~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49dd217069d163de3aec9e3808eb8b87a5605afa;p=thirdparty%2Fntp.git

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

bk: 553c2aa8T-DLDBt0aLHJP-EAHBkz7w
---

49dd217069d163de3aec9e3808eb8b87a5605afa