From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 31 Oct 2016 10:48:56 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb11fed1f6dc40b35f4f116c216324e1acc3b536;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-3125

bk: 58172198rRRWL-ZJLknHbzZlvDOzbA
---

bb11fed1f6dc40b35f4f116c216324e1acc3b536