]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn@psp-deb1.ntp.org:ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 19 Mar 2016 09:22:16 +0000 (02:22 -0700)
committerHarlan Stenn <stenn@ntp.org>
Sat, 19 Mar 2016 09:22:16 +0000 (02:22 -0700)
into  max.pfcs.com:/usr/home/harlan/ntp-stable

bk: 56ed1a48tnUexI4VLB0b2DwNByhqqQ


Trivial merge