]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 4 Mar 2014 08:12:11 +0000 (00:12 -0800)
committerHarlan Stenn <stenn@ntp.org>
Tue, 4 Mar 2014 08:12:11 +0000 (00:12 -0800)
into  hms-mbp11.local:/Users/harlan/src/ntp-dev

bk: 53158adbsxRMTFTdJFFXL4Vv-kOKoQ


Trivial merge