]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/karlsson/sntp-refactoring-dev
authorLinux Karlsson <karlsson@ntp.org>
Fri, 30 Jul 2010 10:38:06 +0000 (06:38 -0400)
committerLinux Karlsson <karlsson@ntp.org>
Fri, 30 Jul 2010 10:38:06 +0000 (06:38 -0400)
into  psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4c52ab8eejoHFec_p6OWu-sUWFTyQw


Trivial merge