From: Stefan Junker <steveeJ@users.noreply.github.com>
Date: Thu, 24 Sep 2015 11:10:47 +0000 (+0200)
Subject: Merge pull request #63 from steveeJ/no-host-local-ptp
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=39ea97f99dd10c53932ab0c86ef7d3fec3502014;p=cni.git

Merge pull request #63 from steveeJ/no-host-local-ptp

Merge host-local and host-local-ptp
---

39ea97f99dd10c53932ab0c86ef7d3fec3502014