summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2014-01-11 14:47:35 -0500
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2014-01-11 14:47:35 -0500
commit11b20594535ddb984a82507c8dba94092a364062 (patch)
treeb3cd3cff07468085567285cea431a5aff75164d0 /doc
parent19ad371f113be59b36b02b3e5ff73bf713906923 (diff)
parentadd057026d4e6fb3e3fbabc1fdde7b656e850925 (diff)
downloadpyopenssl-11b20594535ddb984a82507c8dba94092a364062.tar.gz
Merge remote-tracking branch 'pyca/master' into release-0.14
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions