From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 16 Sep 2013 07:54:44 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P387~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2ba23dc222e96cd04f76a9cfeaba298f6f5f5b2;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 5236b944HrzbmATL657VMuC6q1umTQ
---

a2ba23dc222e96cd04f76a9cfeaba298f6f5f5b2