]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff74ce3 fd30f40)
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 25 Apr 2015 02:48:11 +0000 (22:48 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 25 Apr 2015 02:48:11 +0000 (22:48 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 553b006bqGOJDwixVErYzX2EsdQFdw


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