]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3eee9d3 fdb2bdb)
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 5 Mar 2014 23:24:08 +0000 (15:24 -0800)
committerHarlan Stenn <stenn@ntp.org>
Wed, 5 Mar 2014 23:24:08 +0000 (15:24 -0800)
into  hms-mbp11.local:/Users/harlan/src/ntp-dev

bk: 5317b218B2d4_rEkCBaqcwVUzgJOUw


Trivial merge
Mirror of https://github.com/ntp-project/ntp.git