From: Martin Burnicki <burnicki@ntp.org>
Date: Mon, 22 Jun 2015 10:40:47 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_2_8P3_RC2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df6f082ff3205d3b0db27277329f64557d3dacc0;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/burnicki/ntp-stable+smear

bk: 5587e62f86GDUT7T4Y-wspbxTi256Q
---

df6f082ff3205d3b0db27277329f64557d3dacc0