]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 30 Apr 2015 04:56:13 +0000 (04:56 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 30 Apr 2015 04:56:13 +0000 (04:56 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-stable-2808

bk: 5541b5edEm0Y3KZ5tzoYi8iYaQygeA

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge