diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2014-01-08 13:53:23 -0500 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2014-01-08 13:53:23 -0500 |
| commit | df1c2335c82165b961b8a0361d0176cdb298e513 (patch) | |
| tree | 7fcf397321be4a85ad4a757751568a4082b02305 /requests/__init__.py | |
| parent | 1500632b602be698bfce682daeb01a2d64fc2d39 (diff) | |
| parent | b17cad65cf27646f0680954914ab31abd4f626c9 (diff) | |
| download | python-requests-fix-pickling-adapters.tar.gz | |
Merge branch 'master' into fix-pickling-adaptersfix-pickling-adapters
Conflicts:
AUTHORS.rst
Diffstat (limited to 'requests/__init__.py')
| -rw-r--r-- | requests/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/requests/__init__.py b/requests/__init__.py index d5d258e8..9c889d7c 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -36,7 +36,7 @@ usage: The other HTTP methods are supported - see `requests.api`. Full documentation is at <http://python-requests.org>. -:copyright: (c) 2013 by Kenneth Reitz. +:copyright: (c) 2014 by Kenneth Reitz. :license: Apache 2.0, see LICENSE for more details. """ @@ -46,7 +46,7 @@ __version__ = '2.1.0' __build__ = 0x020100 __author__ = 'Kenneth Reitz' __license__ = 'Apache 2.0' -__copyright__ = 'Copyright 2013 Kenneth Reitz' +__copyright__ = 'Copyright 2014 Kenneth Reitz' # Attempt to enable urllib3's SNI support, if possible try: |