]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-fb1.ntp.org:/home/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Fri, 7 Jan 2011 09:19:30 +0000 (09:19 +0000)
committerHarlan Stenn <stenn@ntp.org>
Fri, 7 Jan 2011 09:19:30 +0000 (09:19 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-libevent

bk: 4d26daa2zMcMfgxFLs-xRkOCXDerTg


Trivial merge