From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 17 Nov 2015 04:52:16 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/.stage/h-thump2/burnicki/ntp-stable-2965
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57b813a15a18763016dc0485867cd42a35de0637;p=thirdparty%2Fntp.git

Merge psp-at1.ntp.org:/.stage/h-thump2/burnicki/ntp-stable-2965
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable

bk: 564ab280yRbsIYFqIoXFe3wpjcQIOA
---

57b813a15a18763016dc0485867cd42a35de0637