]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 29 Mar 2015 03:25:50 +0000 (03:25 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 29 Mar 2015 03:25:50 +0000 (03:25 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-2769

bk: 551770be0pILZ2iyorekyz6qcYM9XA

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge