]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 22 Nov 2016 11:23:12 +0000 (03:23 -0800)
committerHarlan Stenn <stenn@ntp.org>
Tue, 22 Nov 2016 11:23:12 +0000 (03:23 -0800)
into  fb-x86-a.pfcs.com:/usr/home/harlan/src/ntp-stable

bk: 58342aa0XLu9tnETff056takdQiRVA


Trivial merge