]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 26 Apr 2015 00:00:40 +0000 (20:00 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 26 Apr 2015 00:00:40 +0000 (20:00 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-stable

bk: 553c2aa8T-DLDBt0aLHJP-EAHBkz7w


Trivial merge