]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 25 May 2011 07:08:54 +0000 (03:08 -0400)
committerHarlan Stenn <stenn@ntp.org>
Wed, 25 May 2011 07:08:54 +0000 (03:08 -0400)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 4ddcab065LOdk4HLcyWq-uoYVVP9Sw


Trivial merge