]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 24 Sep 2015 10:48:24 +0000 (06:48 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 24 Sep 2015 10:48:24 +0000 (06:48 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-stable

bk: 5603d4f80B4mgv4BTD85lxNtB4ku7Q


Trivial merge