]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 29 Dec 2010 07:45:36 +0000 (02:45 -0500)
committerHarlan Stenn <stenn@ntp.org>
Wed, 29 Dec 2010 07:45:36 +0000 (02:45 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d1ae7202BZOMmVCEFYdkw7A1khjbw


Trivial merge