From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 29 Mar 2015 15:47:32 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/stable'
X-Git-Tag: v4.2.0b1~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad403acd180c56573ca15e4e5841162dc55b6d9f;p=thirdparty%2Ftornado.git

Merge remote-tracking branch 'origin/stable'
---

ad403acd180c56573ca15e4e5841162dc55b6d9f
diff --cc tornado/auth.py
index 85f967cb0,00343fb68..586c3dae7
--- a/tornado/auth.py
+++ b/tornado/auth.py
@@@ -32,9 -32,7 +32,9 @@@ They all take slightly different argume
  services implement authentication and authorization slightly differently.
  See the individual service classes below for complete documentation.
  
- Example usage for Google OpenID:
 -Example usage for Google OAuth::
++Example usage for Google OAuth:
 +
 +.. testcode::
  
      class GoogleOAuth2LoginHandler(tornado.web.RequestHandler,
                                     tornado.auth.GoogleOAuth2Mixin):