]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 14 Sep 2015 06:49:29 +0000 (06:49 +0000)
committerHarlan Stenn <stenn@ntp.org>
Mon, 14 Sep 2015 06:49:29 +0000 (06:49 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 55f66df975d4eq9A4hwPdGuskjxnSA

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge