From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 9 May 2014 05:39:48 +0000 (-0700)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P442~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eea9f6843ea01b9ef52adebdefb1530529ea53c0;p=thirdparty%2Fntp.git

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

bk: 536c6a24GfsAw-7pkr3ydgMLWgu5Iw
---

eea9f6843ea01b9ef52adebdefb1530529ea53c0