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

bk: 53163b1d1T4I4H0E5Uq2lniPcN6VWA


Trivial merge