From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 28 Feb 2015 11:28:30 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_3~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcf1c157f5f4dbbcac80541df11fb6e528bd62b0;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: 54f1a65emhesbhN-V8zzFiLsU1MJ5g
---

dcf1c157f5f4dbbcac80541df11fb6e528bd62b0