]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 28 Apr 2016 08:25:49 +0000 (01:25 -0700)
committerHarlan Stenn <stenn@ntp.org>
Thu, 28 Apr 2016 08:25:49 +0000 (01:25 -0700)
into  max.pfcs.com:/usr/home/harlan/ntp-stable

bk: 5721c90diOn0OEbzDH8euFdGFGZcFQ


Trivial merge