]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/karlsson/sntp-refactoring-dev
authorLinux Karlsson <karlsson@ntp.org>
Wed, 18 Aug 2010 20:47:01 +0000 (16:47 -0400)
committerLinux Karlsson <karlsson@ntp.org>
Wed, 18 Aug 2010 20:47:01 +0000 (16:47 -0400)
into  psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4c6c46c5cGTz_dzlyuckoZAPUtMz9g


Trivial merge