]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 19 Mar 2016 09:11:21 +0000 (09:11 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 19 Mar 2016 09:11:21 +0000 (09:11 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

bk: 56ed17b9zc68GkrII0GZCzCDvJLdGQ


Trivial merge