]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn@psp-deb1.ntp.org:ntp-stable-p9
authorHarlan Stenn <stenn@ntp.org>
Mon, 10 Oct 2016 08:48:21 +0000 (01:48 -0700)
committerHarlan Stenn <stenn@ntp.org>
Mon, 10 Oct 2016 08:48:21 +0000 (01:48 -0700)
into  max.pfcs.com:/usr/home/harlan/ntp-stable-p9

bk: 57fb55d59WHt27kyzaukryIRL4ebAg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge