Merge branch 'master' of github.com:containernetworking/plugins into anycast-v1
authorMichael C Cambria <mcc@node.halfball.org>
Tue, 23 May 2017 13:15:01 +0000 (13:15 +0000)
committerMichael C Cambria <mcc@node.halfball.org>
Tue, 23 May 2017 13:15:01 +0000 (13:15 +0000)

Trivial merge