]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 20 Oct 2016 19:29:15 +0000 (19:29 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 20 Oct 2016 19:29:15 +0000 (19:29 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p9

bk: 58091b0bUti02o8Vf1TestyluWHJ5w


Trivial merge