]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/sntp-refactoring-dev
authorLinux Karlsson <karlsson@ntp.org>
Tue, 10 Aug 2010 10:10:24 +0000 (12:10 +0200)
committerLinux Karlsson <karlsson@ntp.org>
Tue, 10 Aug 2010 10:10:24 +0000 (12:10 +0200)
into  beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/ntp-gsoc-testing

bk: 4c612590Y58OTKVWSkU360s_MQvBAQ

1  2 
sntp/networking.c

Simple merge