]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 13 Jun 2015 09:59:48 +0000 (05:59 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 13 Jun 2015 09:59:48 +0000 (05:59 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 557bff149IopIAmRbK81kqXgvDFRug

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge