Merge branch 'master' of git.openssl.org:openssl-web
[openssl-web.git] / community / conduct.html
2015-10-28 Rich Salzadd conduct; after vote.