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-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a363c6f0ff4cbdbe79e86c9a6ee20f9e5047334;p=thirdparty%2Fntp.git

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

bk: 553c2aa8T-DLDBt0aLHJP-EAHBkz7w
---

3a363c6f0ff4cbdbe79e86c9a6ee20f9e5047334