From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 30 Jan 2015 07:24:03 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_2_8P1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=604977a8de80af2ac16a8483aa2b741fd7cdf1be;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2671

bk: 54cb3193ijgx0FiZ_ZuD6P5YjLx3Eg
---

604977a8de80af2ac16a8483aa2b741fd7cdf1be