From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 3 May 2015 08:21:31 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae09950459d23b1c1d49a45f439d79a2385ff447;p=thirdparty%2Fntp.git

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

bk: 5545da8bVYCtoSOx-r4xgmmt9ASrXw
---

ae09950459d23b1c1d49a45f439d79a2385ff447