]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 24 Jan 2016 06:22:51 +0000 (06:22 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 24 Jan 2016 06:22:51 +0000 (06:22 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

bk: 56a46dbbZIvdztQNvft81otYydsX_A


Trivial merge