]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1776
authorHarlan Stenn <stenn@ntp.org>
Fri, 7 Jan 2011 04:08:00 +0000 (23:08 -0500)
committerHarlan Stenn <stenn@ntp.org>
Fri, 7 Jan 2011 04:08:00 +0000 (23:08 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d2691a0fkZo2uKIMsjwzFuJLz2UHg

1  2 
util/ntp-keygen.c

Simple merge