]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 16 Sep 2013 08:30:26 +0000 (01:30 -0700)
committerHarlan Stenn <stenn@ntp.org>
Mon, 16 Sep 2013 08:30:26 +0000 (01:30 -0700)
into  hms-mbp11.local:/Users/harlan/src/ntp-dev-dlm

bk: 5236c1a26KkuuYuUYSP7_kX5tAWzxA

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge