From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 4 Mar 2015 11:18:10 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13bc30fea6ac549436492fe3897a8b7bcd758f44;p=thirdparty%2Fntp.git

Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 54f6e9f2Lxb4ZP3nWl6zQHsTWSUC5Q
---

13bc30fea6ac549436492fe3897a8b7bcd758f44