From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 24 Jan 2016 06:22:51 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a17518690a8295032aba8bd7c2090e02d388152;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

bk: 56a46dbbZIvdztQNvft81otYydsX_A
---

1a17518690a8295032aba8bd7c2090e02d388152