From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 9 Nov 2016 08:27:53 +0000 (-0800)
Subject: Merge stenn@psp-deb1.ntp.org:ntp-stable-p9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b516e8b9d4b03e689db856873f31289794f6536;p=thirdparty%2Fntp.git

Merge stenn@psp-deb1.ntp.org:ntp-stable-p9
into  max.pfcs.com:/homes/harlan/src/ntp-stable-p9

bk: 5822de09zM2foaZKJSkwfCAD7g__0g
---

9b516e8b9d4b03e689db856873f31289794f6536