From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 10 Mar 2017 10:18:51 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d14ed8dd296cfde1c33511df58c3fe071e153274;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p10
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p10-burnicki

bk: 58c27d8b-ptAB5iofFFVm3hZcHREKQ
---

d14ed8dd296cfde1c33511df58c3fe071e153274