]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-dev-sec
authorHarlan Stenn <stenn@ntp.org>
Thu, 18 Dec 2014 10:09:23 +0000 (10:09 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 18 Dec 2014 10:09:23 +0000 (10:09 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev-sec-2671

bk: 5492a7d3gz-5xpq6BCQE24xwtDxNLA


Trivial merge