]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e46e9c 2814ea4)
Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev
authorLinux Karlsson <karlsson@ntp.org>
Thu, 26 Aug 2010 10:13:36 +0000 (06:13 -0400)
committerLinux Karlsson <karlsson@ntp.org>
Thu, 26 Aug 2010 10:13:36 +0000 (06:13 -0400)
into  psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4c763e50G_rSKy-NRS7oZFxGi_3NWQ


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