]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn@psp-deb1.ntp.org:ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 23 Mar 2016 07:35:49 +0000 (00:35 -0700)
committerHarlan Stenn <stenn@ntp.org>
Wed, 23 Mar 2016 07:35:49 +0000 (00:35 -0700)
into  max.pfcs.com:/usr/home/harlan/ntp-stable

bk: 56f24755KV0dqWcBpyjMRM3ldNk9TA

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge