]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk2.ntp.org./ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 24 Oct 2010 06:26:46 +0000 (02:26 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 24 Oct 2010 06:26:46 +0000 (02:26 -0400)
into  psp-deb1.ntp.org:/home/hart/ntp-stable-1675

bk: 4cc3d1a6hWMOP4kIMovufhwC8EkwAA


Trivial merge