]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 18 Nov 2012 12:16:12 +0000 (07:16 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sun, 18 Nov 2012 12:16:12 +0000 (07:16 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 50a8d18cVHzxq3tl6XnMKpc01u2I6g


Trivial merge