Merge pull request #369 from containernetworking/port-mapping
authorTom Denham <tom@tomdee.co.uk>
Tue, 14 Feb 2017 19:47:59 +0000 (11:47 -0800)
committerGitHub <noreply@github.com>
Tue, 14 Feb 2017 19:47:59 +0000 (11:47 -0800)
CONVENTIONS.md: Update details on port-mappings


Trivial merge