]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 2 Jun 2016 13:12:17 +0000 (09:12 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 2 Jun 2016 13:12:17 +0000 (09:12 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 575030b1V1W2poLK2wNBFT1cXFkVVw


Trivial merge