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

bk: 5603de591UaSGTRvrVqk0agsz7YODw


Trivial merge