Merge branch 'master' of github.com:containernetworking/cni into chain-test
authorMichael C Cambria <mcc@node.halfball.org>
Thu, 31 Aug 2017 14:49:39 +0000 (14:49 +0000)
committerMichael C Cambria <mcc@node.halfball.org>
Thu, 31 Aug 2017 14:49:39 +0000 (14:49 +0000)
Keeping up to date with master


Trivial merge