]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 29 Sep 2016 12:00:23 +0000 (12:00 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 29 Sep 2016 12:00:23 +0000 (12:00 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-3059

bk: 57ed0257R_eyMfAeYQfwQgEO5QBlSg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge