From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 17 May 2016 08:59:45 +0000 (-0700)
Subject: Merge stenn@psp-deb1.ntp.org:ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ea843b176bdadd1542c129bb2ad1134b5417c37;p=thirdparty%2Fntp.git

Merge stenn@psp-deb1.ntp.org:ntp-stable
into  max.pfcs.com:/usr/home/harlan/ntp-stable

bk: 573add81DbJrBCN-uK5QQAmA69Kvvg
---

9ea843b176bdadd1542c129bb2ad1134b5417c37