]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 14 Jun 2015 05:20:54 +0000 (01:20 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 14 Jun 2015 05:20:54 +0000 (01:20 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 557d0f369P7EhvN3rYpvLh2Ec1SMGg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge