]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 11 Jun 2015 02:44:02 +0000 (02:44 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 11 Jun 2015 02:44:02 +0000 (02:44 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity

bk: 5578f5f2EIy56ufegax4xM4PquqHfQ

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge