]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 19 Jan 2016 23:10:39 +0000 (23:10 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 19 Jan 2016 23:10:39 +0000 (23:10 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 569ec26fF-RcIccBBfpMJxTQmJIOQQ


Trivial merge