Merge branch 'v2.0.x'

mdboom · mdboom · commit 52616047b7bf · 2015-12-09T09:00:43.000-05:00
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -184,7 +184,7 @@ <h1>Open source</h1>
 the <a href="http://numfocus.org/johnhunter/">John Hunter Memorial
 Fund</a>.
 </p>
-x
+
 <p>
 The matplotlib <a href="{{ pathto('users/license') }}">license</a> is based on the Python Software Foundation
 <a href="http://www.python.org/psf/license">(PSF)</a> license.
