]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 25 Sep 2015 04:22:11 +0000 (04:22 +0000)
committerHarlan Stenn <stenn@ntp.org>
Fri, 25 Sep 2015 04:22:11 +0000 (04:22 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 5604cbf32DSR_BhYPiESvUO9unN4Tw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge