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

bk: 5604f247pbDxBsm6S4lpuPtcGA3vbQ


Trivial merge