Merge branch 'master' into release

urllib3 · Mar 25, 2012 · 5366c01 · 5366c01
2 parents bca8c7a + 147d62c
commit 5366c01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/README.rst b/README.rst
@@ -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

diff --git a/docs/index.rst b/docs/index.rst
@@ -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.