]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 15 Oct 2013 10:15:35 +0000 (03:15 -0700)
committerHarlan Stenn <stenn@ntp.org>
Tue, 15 Oct 2013 10:15:35 +0000 (03:15 -0700)
into  hms-mbp11.local:/Users/harlan/src/ntp-dev-dlm

bk: 525d15c7tJZqJT461Ym-YrY6bgGcPQ


Trivial merge