]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 28 Jul 2015 09:41:13 +0000 (09:41 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 28 Jul 2015 09:41:13 +0000 (09:41 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 55b74e39fInlsceH1fTWOILYeDp4Gg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge