diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-03 15:03:17 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-03 15:03:17 -0800 |
| commit | 327742c8e6271e2b6d809e891bd8e518b89994d9 (patch) | |
| tree | 324a70bd84ddbc3490f20c0e3413ef1ecc6e3315 /cryptography | |
| parent | eba623f88260a9a076ce3a4a71d1d61755327e05 (diff) | |
| parent | f96db83a64bb0ac40d04d27383d7c2defbcec491 (diff) | |
| download | cryptography-327742c8e6271e2b6d809e891bd8e518b89994d9.tar.gz cryptography-327742c8e6271e2b6d809e891bd8e518b89994d9.tar.bz2 cryptography-327742c8e6271e2b6d809e891bd8e518b89994d9.zip | |
Merge branch 'master' into setup-install-extension
Conflicts:
setup.py
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/__about__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cryptography/__about__.py b/cryptography/__about__.py index 46212bff..54a9dbe6 100644 --- a/cryptography/__about__.py +++ b/cryptography/__about__.py @@ -26,7 +26,7 @@ __version__ = "0.1.dev1" __author__ = ("Alex Gaynor, Hynek Schlawack, Donald Stufft, " "Laurens Van Houtven, Jean-Paul Calderone, Christian Heimes, " - "and individual contributors.") + "Paul Kehrer, and individual contributors.") __email__ = "cryptography-dev@python.org" __license__ = "Apache License, Version 2.0" |