Merge branch 'master' of github.com:containernetworking/cni
authorVZ Cambria <vzcambria@gmail.com>
Tue, 27 Dec 2016 19:38:13 +0000 (14:38 -0500)
committerVZ Cambria <vzcambria@gmail.com>
Tue, 27 Dec 2016 19:38:13 +0000 (14:38 -0500)
Pull upstram 2016 Dec 27


Trivial merge