]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 4 Jan 2011 06:16:17 +0000 (01:16 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 4 Jan 2011 06:16:17 +0000 (01:16 -0500)
into  psp-deb1.ntp.org:/home/perlinger/ntp-dev-1771

bk: 4d22bb31-FBQIKanomZQqUz5I4WwdQ

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge