]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorLinux Karlsson <karlsson@ntp.org>
Wed, 18 Aug 2010 20:45:34 +0000 (22:45 +0200)
committerLinux Karlsson <karlsson@ntp.org>
Wed, 18 Aug 2010 20:45:34 +0000 (22:45 +0200)
into  beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/sntp-refactoring-dev

bk: 4c6c466el-qTI6Jb-f9_Nf02a9kyrA

1  2 
sntp/networking.c

Simple merge