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

bk: 5604f33c6zrlZzKwnWwtklqtA7jqBw


Trivial merge