]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 21 Mar 2017 10:06:43 +0000 (06:06 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 21 Mar 2017 10:06:43 +0000 (06:06 -0400)
into  deacon.udel.edu:/deacon/backroom/snaps/ntp-stable

bk: 58d0fb33khgPKGvZcagJc9G_xpmrsw


Trivial merge