Merge remote-tracking branch 'trevp/pemfix' into trev-pem-fix
authorBen Laurie <ben@links.org>
Fri, 20 Sep 2013 13:39:33 +0000 (14:39 +0100)
committerTrevor Perrin <unsafe@trevp.net>
Fri, 20 Sep 2013 22:39:08 +0000 (15:39 -0700)
commit4f8a706dc7eae6e775f153f6629a1bbd9e134499
tree51a73344690c62690b81e3f90d94b837fcbdb4e0
parent7560f63909bdb1baa751eadc7538e44f27c3f731
Merge remote-tracking branch 'trevp/pemfix' into trev-pem-fix
doc/ssl/SSL_CTX_use_serverinfo.pod
ssl/ssl_rsa.c
test/serverinfo.pem