]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 3 Mar 2014 10:31:32 +0000 (02:31 -0800)
committerHarlan Stenn <stenn@ntp.org>
Mon, 3 Mar 2014 10:31:32 +0000 (02:31 -0800)
into  hms-mbp11.local:/Users/harlan/src/ntp-dev

bk: 53145a04ho0_qKY29eE2eQs_acolqA


Trivial merge