]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 28 Sep 2016 11:15:58 +0000 (11:15 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 28 Sep 2016 11:15:58 +0000 (11:15 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-3068

bk: 57eba66eFKy6iRxs8TIggAFXC3Jkyw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge