]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 30 Sep 2015 04:28:28 +0000 (04:28 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 30 Sep 2015 04:28:28 +0000 (04:28 +0000)
into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-2332-v2

bk: 560b64ecg7mMDJmzrgq-biuwR-bkvg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge