]> 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:47:23 +0000 (07:47 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 30 Sep 2015 07:47:23 +0000 (07:47 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 560b938bciJwI3fwlrmr8TRsjtsCAQ

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge