From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 28 Aug 2013 09:47:48 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P387~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82f1b075bc397e8829870e279ec696470d8804ea;p=thirdparty%2Fntp.git

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

bk: 521dc744lJbgEQQbLJLzmgWcgbo60Q
---

82f1b075bc397e8829870e279ec696470d8804ea