]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 30 Jan 2015 07:24:03 +0000 (07:24 +0000)
committerHarlan Stenn <stenn@ntp.org>
Fri, 30 Jan 2015 07:24:03 +0000 (07:24 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2671

bk: 54cb3193ijgx0FiZ_ZuD6P5YjLx3Eg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge