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

bk: 4d279e161_ONlYPdak6WAqDIegfgxg


Trivial merge