diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-09 19:09:05 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-09 19:09:05 -0600 |
| commit | 588b0acac807f4aaa6da564be7f0363626415d4b (patch) | |
| tree | edb7131a6f11a5ef525c77a583ceaaa19e2119a6 /cryptography | |
| parent | 79a230f81ff702d590ebc36169dc11392019839f (diff) | |
| parent | 3d5913d223ecac8e130c8b2a8fcb25a715f57f3b (diff) | |
| download | cryptography-588b0acac807f4aaa6da564be7f0363626415d4b.tar.gz cryptography-588b0acac807f4aaa6da564be7f0363626415d4b.tar.bz2 cryptography-588b0acac807f4aaa6da564be7f0363626415d4b.zip | |
Merge branch 'master' into common-crypto-binding
* master:
temporary workaround for travis-ci bug
Style nit
easy_install is awful, don't use it
Simplify the authors section
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/__about__.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cryptography/__about__.py b/cryptography/__about__.py index 169e2ff5..ee1d8a05 100644 --- a/cryptography/__about__.py +++ b/cryptography/__about__.py @@ -24,9 +24,7 @@ __uri__ = "https://github.com/pyca/cryptography" __version__ = "0.2.dev1" -__author__ = ("Alex Gaynor, Hynek Schlawack, Donald Stufft, " - "Laurens Van Houtven, Jean-Paul Calderone, Christian Heimes, " - "Paul Kehrer, Alex Stapleton, and individual contributors.") +__author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" __license__ = "Apache License, Version 2.0" |