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

bk: 55a1c023qGOHad4V_ZCIYbZjByVb9A

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge