]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 24 Sep 2015 05:49:18 +0000 (01:49 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 24 Sep 2015 05:49:18 +0000 (01:49 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-stable

bk: 56038edeZgJVWgvty9c0vlBSrL3qXg


Trivial merge