]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 30 Mar 2015 08:57:50 +0000 (08:57 +0000)
committerHarlan Stenn <stenn@ntp.org>
Mon, 30 Mar 2015 08:57:50 +0000 (08:57 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2779-2781

bk: 5519100ewbGX_9kF_hw3RgZE37Uzbw

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge