From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 9 Jun 2015 10:10:39 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_40~6^2~15^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=966edd14c2dcdd4fae4b3bef9dfff6812aef874b;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/stenn/ntp-stable-unity

bk: 5576bb9foGhEj0gZxHuFzCSGfeXj8A
---

966edd14c2dcdd4fae4b3bef9dfff6812aef874b