]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 13 Dec 2009 01:22:43 +0000 (20:22 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sun, 13 Dec 2009 01:22:43 +0000 (20:22 -0500)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev-hms

bk: 4b2441e3mfKfgcjoOfStfjOk2wQW0w


Trivial merge