]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn@psp-deb1.ntp.org:ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 17 May 2016 08:59:45 +0000 (01:59 -0700)
committerHarlan Stenn <stenn@ntp.org>
Tue, 17 May 2016 08:59:45 +0000 (01:59 -0700)
into  max.pfcs.com:/usr/home/harlan/ntp-stable

bk: 573add81DbJrBCN-uK5QQAmA69Kvvg


Trivial merge