From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 20 Jun 2015 01:00:11 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/tflendrich/kod/head/ntp-stable-unity
X-Git-Tag: NTP_4_3_43~2^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e36fc8160954e8283a4f261955ee7c5fedacdf2;p=thirdparty%2Fntp.git

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

bk: 5584bb1bnZF78hW9hDHEXVvvuQm5Sw
---

2e36fc8160954e8283a4f261955ee7c5fedacdf2