From a2e31d4d1633c3aed92f4601b6760b35d6d3416f Mon Sep 17 00:00:00 2001
From: zooko <>
Date: Sat, 1 Oct 2011 05:37:10 +0000
Subject: [PATCH] move soultcer to Emeritus status, fix link to zooko.com from
 pubgrid zlog

[Imported from Trac: page AboutUs, version 21]
---
 AboutUs.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/AboutUs.md b/AboutUs.md
index af0cb75..1b5dd3f 100644
--- a/AboutUs.md
+++ b/AboutUs.md
@@ -8,9 +8,9 @@
 
 <h2>Active Volunteers</h2>
 <table>
-  <tr><td><img src="<http://secorp.net/images/zooko.png>" height=75></td><td><a href="<http://pubgrid.tahoe-lafs.org/uri/URI:DIR2-RO:ixqhc4kdbjxc7o65xjnveoewym:5x6lwoxghrd5rxhwunzavft2qygfkt27oj3fbxlq4c6p45z5uneq/blog.html>">Zooko</a></td><td><img src="<http://tahoe-lafs.org/trac/tahoe-lafs/raw-attachment/wiki/AboutUs/francois_greyscale.jpg>" height=75></td><td><a href="<http://francois.ctrlaltdel.ch>">François Deppierraz</a></td><td><img src="<http://secorp.net/images/kevan_c_bw_sm.png>" height=75></td><td><a href="<http://isnotajoke.com/>">Kevan Carstensen</a></td> 
+  <tr><td><img src="<http://secorp.net/images/zooko.png>" height=75></td><td><a href="<http://zooko.com>">Zooko</a></td><td><img src="<http://tahoe-lafs.org/trac/tahoe-lafs/raw-attachment/wiki/AboutUs/francois_greyscale.jpg>" height=75></td><td><a href="<http://francois.ctrlaltdel.ch>">François Deppierraz</a></td><td><img src="<http://secorp.net/images/kevan_c_bw_sm.png>" height=75></td><td><a href="<http://isnotajoke.com/>">Kevan Carstensen</a></td> 
 </tr>
-  <tr><td><img src="<http://secorp.net/images/warner.png>" height=75></td><td><a href="<http://www.lothar.com>">Brian Warner</a></td><td><img src="<http://secorp.net/images/redhat_small.png>"></td><td>David Triendl</td><td><img src="<http://tahoe-lafs.org/trac/tahoe-lafs/raw-attachment/wiki/AboutUs/marlowe-x75-bw.jpg>" height=75></td><td>Patrick "Marlowe" [McDonald](McDonald)</td></tr>
+  <tr><td><img src="<http://secorp.net/images/warner.png>" height=75></td><td><a href="<http://www.lothar.com>">Brian Warner</a></td><td><img src="<http://tahoe-lafs.org/trac/tahoe-lafs/raw-attachment/wiki/AboutUs/marlowe-x75-bw.jpg>" height=75></td><td>Patrick "Marlowe" [McDonald](McDonald)</td></tr>
   <tr><td><img src="<http://secorp.net/images/davidsarah_bw.png>" height=75></td><td><a href="<http://davidsarah.livejournal.com/>">David-Sarah Hopwood</a></td><td><img src="<http://tahoe-lafs.org/trac/tahoe-lafs/raw-attachment/wiki/AboutUs/freestorm.jpg>"></td><td>Frédéric Marti</td><td><img src="<http://secorp.net/images/QuestionMark_small.jpg>"></td><td>Who are we missing?</td></tr>
   <tr><td><img src="<http://secorp.net/images/psecor.jpg>" height=75></td><td><a href="<http://secorp.net>">Peter Secor</a></td><td><img src="<http://secorp.net/images/marc_tooley_sm.jpg>" height=75></td><td>Marc Tooley</td></tr>
   <tr>
@@ -32,3 +32,9 @@
  
 <h2>Contributors of Source Code and Docs</h2>
 <p>See <a href="<http://tahoe-lafs.org/trac/tahoe-lafs/browser/trunk/CREDITS>">the CREDITS file</a> for a list of everyone who has contributed code and docs which we included in the Tahoe-LAFS source tree.</p>
+
+<h2>Emeritus Volunteers</h2>
+<table>
+  <tr><td><img src="<http://secorp.net/images/redhat_small.png>"></td><td>David Triendl</td>
+</tr>
+</table>