From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 5 Jun 2015 02:33:54 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_35~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b0e5bfb31d9bdf8f65a19045d5d61be2d2beccc;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-2830

bk: 55710a92FzbAvUMwKgW6F2YNjy67wg
---

2b0e5bfb31d9bdf8f65a19045d5d61be2d2beccc