]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 30 Oct 2010 02:21:58 +0000 (22:21 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 30 Oct 2010 02:21:58 +0000 (22:21 -0400)
into  psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4ccb8146EvFVG9VBHKu1BE3U6QTSCA


Trivial merge