]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 1 Oct 2016 10:05:39 +0000 (10:05 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 1 Oct 2016 10:05:39 +0000 (10:05 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p9

bk: 57ef8a73w5kZRZmUuAT_tbhnnUH_uw


Trivial merge