]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 4 Dec 2015 11:39:30 +0000 (06:39 -0500)
committerHarlan Stenn <stenn@ntp.org>
Fri, 4 Dec 2015 11:39:30 +0000 (06:39 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 56617b72n6xUh-4vLBH6_jecDGvDrA


Trivial merge