Merge branch 'v1.2.x'

mdboom · mdboom · commit 284fc0c67285 · 2012-09-12T11:32:53.000-04:00
Conflicts:
	lib/matplotlib/__init__.py
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -40,10 +40,10 @@
 
   <h1>John Hunter (1968-2012)</h1>
 
-  <table>
+  <table bgcolor="#ddddff">
     <tr>
       <td>
-        <img src="John-hunter-crop-2.jpg"/>
+        <img src="_static/John-hunter-crop-2.jpg"/>
         </td>
       <td>
   <p>
