From: Linux Karlsson Date: Tue, 10 Aug 2010 11:05:06 +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=0949ce13faa42404da032ffffd42b6f5696142f2;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: 4c613262nZcvwGHTxAVX8VGXrRxObA --- 0949ce13faa42404da032ffffd42b6f5696142f2