From: Juergen Perlinger <perlinger@ntp.org>
Date: Wed, 28 Sep 2016 19:55:03 +0000 (+0200)
Subject: Merge hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-3095
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=585b26d2ca251c91cda9b893b4ff2ef1f7be2c45;p=thirdparty%2Fntp.git

Merge hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-3095
into  hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-3059-conflict

bk: 57ec2017cXK7hSwjtvFym6RDHv9Ikw
---

585b26d2ca251c91cda9b893b4ff2ef1f7be2c45