]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev
authorLinux Karlsson <karlsson@ntp.org>
Thu, 19 Aug 2010 09:29:04 +0000 (05:29 -0400)
committerLinux Karlsson <karlsson@ntp.org>
Thu, 19 Aug 2010 09:29:04 +0000 (05:29 -0400)
into  psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4c6cf960Bsm4UwUz7rfoearyI5PLXA


Trivial merge