]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45a6b5f ffc86ba)
Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev
authorLinux Karlsson <karlsson@ntp.org>
Sun, 13 Jun 2010 14:07:18 +0000 (10:07 -0400)
committerLinux Karlsson <karlsson@ntp.org>
Sun, 13 Jun 2010 14:07:18 +0000 (10:07 -0400)
into  psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4c14e616vYJhxq56otiwc0U7Gll2tA


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