]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 31 Oct 2016 10:48:56 +0000 (10:48 +0000)
committerHarlan Stenn <stenn@ntp.org>
Mon, 31 Oct 2016 10:48:56 +0000 (10:48 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-3125

bk: 58172198rRRWL-ZJLknHbzZlvDOzbA


Trivial merge