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

bk: 55b74e01WpRikO22jrwf6-Nlmso-Sw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge