From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 30 Sep 2015 06:50:54 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-2332-v2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e5c59bbbb0e5155363ce6b760c75b3a2c8f57d3;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-2332-v2
into  psp-deb1.ntp.org:/home/stenn/ntp-stable

bk: 560b864e78i3D5zTlQTSAO5jsGJI3Q
---

3e5c59bbbb0e5155363ce6b760c75b3a2c8f57d3