]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 15 Sep 2015 07:51:15 +0000 (07:51 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 15 Sep 2015 07:51:15 +0000 (07:51 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 55f7cdf3HAEOv2WgcJQ2n3QUL25bKA


Trivial merge