From: Harlan Stenn Date: Tue, 9 Nov 2010 23:25:30 +0000 (-0500) Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7213eab08f1ea4d0a29b71e7e6e3aa211cd82284;p=thirdparty%2Fntp.git Merge deacon.udel.edu:/deacon/backroom/ntp-stable into deacon.udel.edu:/deacon/backroom/ntp-dev bk: 4cd9d86aA2wkLgQiiVna5XIwzCuCCw --- 7213eab08f1ea4d0a29b71e7e6e3aa211cd82284