]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 7 Jun 2015 23:40:48 +0000 (19:40 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 7 Jun 2015 23:40:48 +0000 (19:40 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 5574d680VZvE7Q4XHSxt4Wk6G-IZ1A

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge