]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 11 Jul 2015 23:22:45 +0000 (19:22 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 11 Jul 2015 23:22:45 +0000 (19:22 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 55a1a5454phQzgIENSKe0teOGIlYFQ

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge