]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p10
authorHarlan Stenn <stenn@ntp.org>
Fri, 10 Mar 2017 10:03:33 +0000 (10:03 +0000)
committerHarlan Stenn <stenn@ntp.org>
Fri, 10 Mar 2017 10:03:33 +0000 (10:03 +0000)
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3384

bk: 58c279f5O0UQzk_StOl0FPvfDWZtHQ


Trivial merge