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

bk: 55710a92FzbAvUMwKgW6F2YNjy67wg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge