diff options
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-27 11:09:54 -0500 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-27 11:09:54 -0500 |
| commit | 504e3cfd829f6b5348f27013a8626106aa6cf995 (patch) | |
| tree | 5dfebbb72769a9886bb43236f884c0ae900617db /docs/glossary.rst | |
| parent | 3d1d97fa108ced9eae99fc99a5d6399811022425 (diff) | |
| parent | b645521e84026633f666aa107816ac2fc5e05cc6 (diff) | |
| download | cryptography-504e3cfd829f6b5348f27013a8626106aa6cf995.tar.gz cryptography-504e3cfd829f6b5348f27013a8626106aa6cf995.tar.bz2 cryptography-504e3cfd829f6b5348f27013a8626106aa6cf995.zip | |
Merge remote-tracking branch 'origin/master' into pyopenssl-test_crypto-with-optionals
Diffstat (limited to 'docs/glossary.rst')
0 files changed, 0 insertions, 0 deletions