merge the two nsf lines, since the first one was just a pass-through, and the second one isn't a pass-through (it's not via georgia tech and princeton, it's straight to us).
Roger Dingledine

Roger Dingledine commited on 2013-08-31 06:37:41
Zeige 1 geänderte Dateien mit 1 Einfügungen und 2 Löschungen.

... ...
@@ -32,8 +32,7 @@
32 32
     <h3><i>Asparagales</i> (up to $500k)</h3>
33 33
     	<ul>
34 34
 	    <li>Internews Europe (2006-2008)</li>
35
-            <li><a href="http://nsf.gov/">National Science Foundation via Drexel University</a> (2009-2011)</li>
36
-	    <li><a href="http://nsf.gov/">National Science Foundation via Georgia Tech and Princeton University</a> (2012-2012)</li>
35
+	    <li><a href="http://nsf.gov/">National Science Foundation</a> (2009-2012)</li>
37 36
 	    <li><a href="http://www.knightfoundation.org/">The Knight Foundation</a> (2012-2012)</li>
38 37
 	    <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-2012)</li>
39 38
     	</ul>
40 39