]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 1 Jul 2015 07:14:29 +0000 (03:14 -0400)
committerHarlan Stenn <stenn@ntp.org>
Wed, 1 Jul 2015 07:14:29 +0000 (03:14 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 559393551U8nvm1dpzN2nOE8wcxWww


Trivial merge