]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 29 Jun 2015 03:22:34 +0000 (23:22 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 29 Jun 2015 03:22:34 +0000 (23:22 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 5590b9faOdNGCe8oQVubnK_heaoIhg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge