]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 20 Jul 2015 06:53:03 +0000 (06:53 +0000)
committerHarlan Stenn <stenn@ntp.org>
Mon, 20 Jul 2015 06:53:03 +0000 (06:53 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity

bk: 55ac9acfp1m7J68b54nGMOI0Urt9vA

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge