From: Linux Karlsson <karlsson@ntp.org>
Date: Tue, 10 Aug 2010 10:10:24 +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=df5952445a616cca7cc362370e69752ad38f4218;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: 4c612590Y58OTKVWSkU360s_MQvBAQ
---

df5952445a616cca7cc362370e69752ad38f4218