Permalink
Browse files

Merge branch 'master' into release

  • Loading branch information...
2 parents bca8c7a + 147d62c commit 5366c01258e5f0ccd77252a361c2723c2481d4df @shazow committed Mar 25, 2012
Showing with 3 additions and 0 deletions.
  1. +1 −0 README.rst
  2. +2 −0 docs/index.rst
View
@@ -8,6 +8,7 @@ Highlights
- Built-in redirection and retries (optional).
- Supports gzip and deflate decoding.
- Thread-safe and sanity-safe.
+- Works with AppEngine, gevent, and eventlib.
- Tested on Python 2.6+ and Python 3.2+, 99% unit test coverage.
- Small and easy to understand codebase perfect for extending and building upon.
For a more comprehensive solution, have a look at
View
@@ -32,6 +32,8 @@ Highlights
- Tested on Python 2.6+ and Python 3.2+, 99% unit test coverage.
+- Works with AppEngine, gevent, and eventlib.
+
- Small and easy to understand codebase perfect for extending and building upon.
For a more comprehensive solution, have a look at
`Requests <http://python-requests.org/>`_ which is also powered by urllib3.

0 comments on commit 5366c01

Please sign in to comment.