]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3471
authorHarlan Stenn <stenn@ntp.org>
Sun, 8 Apr 2018 07:32:40 +0000 (07:32 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 8 Apr 2018 07:32:40 +0000 (07:32 +0000)
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3471

bk: 5ac9c598g51HbBu21bOI6WTDjyNJIw


Trivial merge