From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 9 May 2015 03:37:43 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_3_32~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad06bd96b8e20b66cbfec3d00133058e4ff3dd51;p=thirdparty%2Fntp.git

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

bk: 554d8107FS_JcnP7NFNK7iTJ-r2cIQ
---

ad06bd96b8e20b66cbfec3d00133058e4ff3dd51