From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 16 Sep 2013 08:30:26 +0000 (-0700)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P387~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0562ed942cf3fc2a87ff17e0e56e0aacb7ee8353;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  hms-mbp11.local:/Users/harlan/src/ntp-dev-dlm

bk: 5236c1a26KkuuYuUYSP7_kX5tAWzxA
---

0562ed942cf3fc2a87ff17e0e56e0aacb7ee8353