]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 22 Dec 2009 08:47:34 +0000 (03:47 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 22 Dec 2009 08:47:34 +0000 (03:47 -0500)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4b3087a64LtU4PLxIkIrRM5iAbNPpw


Trivial merge