]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 5 Mar 2014 06:34:34 +0000 (22:34 -0800)
committerHarlan Stenn <stenn@ntp.org>
Wed, 5 Mar 2014 06:34:34 +0000 (22:34 -0800)
into  hms-mbp11.local:/Users/harlan/src/ntp-dev

bk: 5316c57aklw59SC0bWWYF2huHDe8Hg


Trivial merge