]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c35d11 489f0a9)
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 10 Mar 2012 09:54:42 +0000 (04:54 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sat, 10 Mar 2012 09:54:42 +0000 (04:54 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4f5b24e2_ENV6G3FM1L3HrBmjGuctg


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