From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 30 Dec 2012 04:54:41 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P344~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bae9fdce8b29f3e7a49b8db09497f919a27a852e;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-autogen-5.17

bk: 50dfc91174bg8uU-Cr6wpFQ3g5rIpA
---

bae9fdce8b29f3e7a49b8db09497f919a27a852e