]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 8 May 2015 07:36:34 +0000 (07:36 +0000)
committerHarlan Stenn <stenn@ntp.org>
Fri, 8 May 2015 07:36:34 +0000 (07:36 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-stable-2808

bk: 554c6782L1ypmvgKTmjKrcdNvfd8Bg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge