]> 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:58:39 +0000 (10:58 +0000)
committerHarlan Stenn <stenn@ntp.org>
Mon, 31 Oct 2016 10:58:39 +0000 (10:58 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p9

bk: 581723dfHZyH5ia1ESw_Old69BKiqg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge