From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 5 Jan 2016 11:02:27 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable-p5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3ecc39d69f7037c23531f48829a7c7669d57933;p=thirdparty%2Fntp.git

Merge psp-at1.ntp.org:/home/stenn/ntp-stable-p5
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2952-collapse

bk: 568ba2c3bs8_963p-Xoa6jebOmP0xw
---

c3ecc39d69f7037c23531f48829a7c7669d57933