From: Gabe Rosenhouse <rosenhouse@users.noreply.github.com>
Date: Fri, 20 Jan 2017 21:50:24 +0000 (-0800)
Subject: Merge pull request #352 from containernetworking/conventions
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=1acc927ab00909ec81240cea272944c087bacdd2;p=cni.git

Merge pull request #352 from containernetworking/conventions

Documentation: Add conventions doc
---

1acc927ab00909ec81240cea272944c087bacdd2