]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 7 Jun 2015 06:27:48 +0000 (02:27 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 7 Jun 2015 06:27:48 +0000 (02:27 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 5573e464rnvozGc0L8RW1d-KDWYG9g

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge