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

bk: 560b864e78i3D5zTlQTSAO5jsGJI3Q

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge