]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 3 May 2015 08:21:31 +0000 (08:21 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 3 May 2015 08:21:31 +0000 (08:21 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity

bk: 5545da8bVYCtoSOx-r4xgmmt9ASrXw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge