]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 30 Sep 2015 07:41:42 +0000 (07:41 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 30 Sep 2015 07:41:42 +0000 (07:41 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-2888

bk: 560b9236sQkMC5vyiyAvnIrqR7O-Wg

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge