]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-dev-hms2
authorHarlan Stenn <stenn@ntp.org>
Sun, 10 Aug 2008 00:20:19 +0000 (20:20 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 10 Aug 2008 00:20:19 +0000 (20:20 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev-hms

bk: 489e3443j9R53tQgb8BufoFuT8Noww


Trivial merge