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

bk: 4b2d94f8D-TZLygK-L7JM6ZzfulNKg


Trivial merge