From: Juergen Perlinger <perlinger@ntp.org>
Date: Sun, 2 Mar 2014 08:26:08 +0000 (+0100)
Subject: Merge perlinger@psp-deb1.ntp.org:ntp-dev-2570
X-Git-Tag: NTP_4_2_7P428~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e416fc702b489e365fc7aa8a1f47ba94e1d73783;p=thirdparty%2Fntp.git

Merge perlinger@psp-deb1.ntp.org:ntp-dev-2570
into  hydra.(none):/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-dev-2570

bk: 5312eb206cHvTUV6kYAWawqMTzOLww
---

e416fc702b489e365fc7aa8a1f47ba94e1d73783