From: Linux Karlsson Date: Sat, 21 Aug 2010 10:13:23 +0000 (+0200) Subject: Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/sntp-refactoring-dev X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01ee220e30ad1972ff397db8d166f0361c65bab3;p=thirdparty%2Fntp.git Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/sntp-refactoring-dev into beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/ntp-gsoc-testing bk: 4c6fa6c3ii4l2ulvdREOxgn3xREihA --- 01ee220e30ad1972ff397db8d166f0361c65bab3