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

bk: 531d8f92chJQJaUYC54BW4fRnIquuw


Trivial merge