]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 25 Sep 2015 04:35:25 +0000 (00:35 -0400)
committerHarlan Stenn <stenn@ntp.org>
Fri, 25 Sep 2015 04:35:25 +0000 (00:35 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-stable

bk: 5604cf0dueTUruC9FfX83k7oRYjaQg


Trivial merge