]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-dev-sec
authorHarlan Stenn <stenn@ntp.org>
Fri, 19 Dec 2014 08:06:17 +0000 (08:06 +0000)
committerHarlan Stenn <stenn@ntp.org>
Fri, 19 Dec 2014 08:06:17 +0000 (08:06 +0000)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 5493dc79hVEY5OxvMqRYtL8JI8ruxA


Trivial merge