]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable-hms
authorHarlan Stenn <stenn@ntp.org>
Sun, 10 Aug 2008 06:26:59 +0000 (02:26 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 10 Aug 2008 06:26:59 +0000 (02:26 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-stable

bk: 489e8a33cZtcEzCsdmpVKscl5Xzphg


Trivial merge