]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:ntp-stable-p10
authorHarlan Stenn <stenn@ntp.org>
Tue, 21 Mar 2017 10:40:39 +0000 (06:40 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 21 Mar 2017 10:40:39 +0000 (06:40 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-stable

bk: 58d10327F0sSgL3EIfbvwQRtKXV3Og


Trivial merge