]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev
authorLinux Karlsson <karlsson@ntp.org>
Mon, 19 Jul 2010 08:55:36 +0000 (04:55 -0400)
committerLinux Karlsson <karlsson@ntp.org>
Mon, 19 Jul 2010 08:55:36 +0000 (04:55 -0400)
into  psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4c441308A7Dxi4XWtaP8NDrjGZ-zKA


Trivial merge