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

bk: 5313eabdLh6KTyUip-6SJZJx4Gdvzw


Trivial merge