]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 29 Jun 2015 18:48:27 +0000 (18:48 +0000)
committerHarlan Stenn <stenn@ntp.org>
Mon, 29 Jun 2015 18:48:27 +0000 (18:48 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2853

bk: 559192fbm_Oc6kOCMmcipvuKfc2dlg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge