From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 19 Nov 2012 06:48:04 +0000 (-0500)
Subject: Merge deacon.udel.edu:/backroom/snaps/ntp-dev
X-Git-Tag: NTP_4_2_7P324~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2cace67023101f70bff281f94a9f3d9d0ebe043;p=thirdparty%2Fntp.git

Merge deacon.udel.edu:/backroom/snaps/ntp-dev
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 50a9d624C5g8o7tVQ784Bz4lJzHqPQ
---

a2cace67023101f70bff281f94a9f3d9d0ebe043