aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-08-21 11:35:55 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-08-21 11:35:55 -0700
commit22bc06a6c65ba639ee0dfce37c493ba197c7f344 (patch)
tree60bf16d5f3f86740ce6445085c964fe439918a3d /docs
parent7154fa6017e3332570de52065f1eb5c4311a120e (diff)
parent12e4742b47de9c889168837912b5e0487226b341 (diff)
downloadcryptography-22bc06a6c65ba639ee0dfce37c493ba197c7f344.tar.gz
cryptography-22bc06a6c65ba639ee0dfce37c493ba197c7f344.tar.bz2
cryptography-22bc06a6c65ba639ee0dfce37c493ba197c7f344.zip
Merge pull request #1313 from reaperhulk/0.5.4-changelog
port 0.5.4 changelog to master
Diffstat (limited to 'docs')
-rw-r--r--docs/spelling_wordlist.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
index d90547a8..b16026f6 100644
--- a/docs/spelling_wordlist.txt
+++ b/docs/spelling_wordlist.txt
@@ -38,8 +38,10 @@ plaintext
preprocessor
preprocessors
pseudorandom
+pyOpenSSL
Schneier
scrypt
+Solaris
Tanja
testability
Ubuntu