]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-at1.ntp.org:ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 27 Jul 2015 02:40:51 +0000 (22:40 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 27 Jul 2015 02:40:51 +0000 (22:40 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 55b59a33eeyLLO76SrGjsAlHShDF7g


Trivial merge