]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-winio2
authorHarlan Stenn <stenn@ntp.org>
Wed, 9 Nov 2016 06:04:55 +0000 (06:04 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 9 Nov 2016 06:04:55 +0000 (06:04 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p9-winio2

bk: 5822bc87TFxdRGV45hb4Fc5yzvXOww

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge