From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 8 May 2015 07:36:34 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_31~6^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d1653a0a45ac28770ad034d3d20d25fc085ee51;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-stable-2808

bk: 554c6782L1ypmvgKTmjKrcdNvfd8Bg
---

5d1653a0a45ac28770ad034d3d20d25fc085ee51