]> 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 18:07:15 +0000 (14:07 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 29 Jun 2015 18:07:15 +0000 (14:07 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 55918953WyheooebR2me5dTcSjAXjw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge