]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge deacon.udel.edu:/backroom/snaps/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Thu, 28 Jul 2011 06:45:18 +0000 (02:45 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 28 Jul 2011 06:45:18 +0000 (02:45 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4e31057ejiB9YbpcDckB24XHggBc9Q


Trivial merge