From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 7 Jun 2015 09:27:40 +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=f7286d58c0fc3c5127a5776b7818bff3fb6716fd;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/perlinger/ntp-stable-2830

bk: 55740e8cWYbY4-07WQCYcgwnVgh0yA
---

f7286d58c0fc3c5127a5776b7818bff3fb6716fd