From: VZ Cambria <vzcambria@gmail.com>
Date: Tue, 27 Dec 2016 19:38:13 +0000 (-0500)
Subject: Merge branch 'master' of github.com:containernetworking/cni
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=ea324b61d8e203b5b51d3f11c805e5a0c7b300c2;p=cni.git

Merge branch 'master' of github.com:containernetworking/cni

Pull upstram 2016 Dec 27
---

ea324b61d8e203b5b51d3f11c805e5a0c7b300c2