www/thankgnus 2014supporters.html

[David Thompson]

CVSROOT:        /web/www
Module name:    www
Changes by:     David Thompson <davexunit>      14/09/02 13:40:56

Modified files:
        thankgnus      : 2014supporters.html 

Log message:
        Fix conflict.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/thankgnus/2014supporters.html?cvsroot=www&r1=1.57&r2=1.58

Patches:
Index: 2014supporters.html
===================================================================
RCS file: /web/www/www/thankgnus/2014supporters.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- 2014supporters.html 1 Sep 2014 12:02:55 -0000       1.57
+++ 2014supporters.html 2 Sep 2014 13:40:56 -0000       1.58
@@ -75,13 +75,16 @@
 
 <ul>
 <li>Aleph Objects, Inc.</li>
+<li>Alexander Steinhoff</li>
+<li>Andrea Tasso in honor of Mr. Antonio Tasso</li>
 <li>Anthony J. Stieber</li>
 <li>Ashley Fryer</li>
+<li>Association for Computing Machinery</li>
 <li>Colin Carr</li>
 <li>Daniel Kahn Gillmor</li>
 <li>David Caldwell</li>
 <li>Dmitriy Korolev</li>
-<li>Donald E. Knuth</li>
+<li>Donald and Jill Knuth</li>
 <li>George Tsiagalakis</li>
 <li>Gregory Maxwell</li>
 <li>Inouye Satoru</li>
@@ -90,9 +93,12 @@
 <li>Jeff Weston</li>
 <li>John Schneiderman</li>
 <li>Kevin J. McCarthy</li>
+<li>Krishna Kunchithapadam</li>
 <li>Matt Kraai</li>
 <li>Michael D'Errico</li>
 <li>Michael P. Wilson</li>
+<li>Rick and Betty Bronson</li>
+<li>Stephen Ippolito</li>
 <li>Steve Sprang</li>
 <li>Vinod Kurup</li>
 <li>Walter Lain</li>
@@ -110,19 +116,21 @@
 <li>0gb.us</li>
 <li>Aaron Culich</li>
 <li>Aaron Culliney</li>
+<li>Aaron Gotwalt</li>
 <li>Adam Klotblixt</li>
 <li>Adel Shalawi</li>
+<li>Alain Brenzikofer</li>
 <li>Alejandro Luis Bonavita</li>
 <li>Alessandro Vesely</li>
 <li>Alex Liu</li>
 <li>Allan Fields</li>
 <li>Alon Levy</li>
-<li>Andrea Tasso</li>
 <li>Andreas Berg</li>
 <li>Andrew Lewman</li>
 <li>Andrew V. Belousoff</li>
 <li>Antonio Carzaniga</li>
 <li>Arild Lund</li>
+<li>Badley Geoscience Limited<li>
 <li>Ben Sturmfels</li>
 <li>Boone Gorges</li>
 <li>Brett Smith</li>
@@ -144,6 +152,7 @@
 <li>Dave Johnson</li>
 <li>David Ayers</li>
 <li>David Bruce</li>
+<li>David Fifield</li>
 <li>David Hampton</li>
 <li>David Johnson</li>
 <li>David Klann</li>
@@ -153,9 +162,11 @@
 <li>Dennis W. Tokarski</li>
 <li>Detlef Girke</li>
 <li>Diego Sarmentero</li>
+<li>Dominik Kellner</li>
 <li>Douglas Hauge</li>
 <li>Doyle Myers</li>
 <li>Dr. Luis Fajardo López</li>
+<li>Dutt-Keshavacharya</li>
 <li>Eberhard Schopf</li>
 <li>Ed Price</li>
 <li>Edward Fahner</li>
@@ -175,6 +186,7 @@
 <li>Henrik Hedelund</li>
 <li>iFixit</li>
 <li>I-Lun Tseng</li>
+<li>Iljaszenko Charitable Fund</li>
 <li>Iñaki Arenaza</li>
 <li>Jack Lawson</li>
 <li>James A Cole</li>
@@ -210,8 +222,10 @@
 <li>Mark Suter</li>
 <li>Markus Schaldach</li>
 <li>Mason Smith</li>
+<li>Matthew Hillyard</li>
 <li>Matthias Herrmann</li>
 <li>MeansofInquiry.org</li>
+<li>Michael Albert</li>
 <li>Michael and Amy Tiemann</li>
 <li>Michael Dorrington</li>
 <li>Michael Henderson</li>
@@ -219,6 +233,7 @@
 <li>Mikaël Cluseau</li>
 <li>Mikiya Okuno</li>
 <li>Mikko Värri</li>
+<li>Mirko Luedde</li>
 <li>Minoru Sekine</li>
 <li>Morten Lind</li>
 <li>Mridul Muralidharan</li>
@@ -259,6 +274,7 @@
 <li>Trevor Spiteri</li>
 <li>Tyng-Ruey Chuang</li>
 <li>Uday Kale</li>
+<li>US Charitable Gift Trust in honor of Daniel G and Lynn B. Grimes</li>
 <li>Valerio Poggi</li>
 <li>Vincent Hobeïka</li>
 <li>Vincent Launchbury</li>
@@ -326,7 +342,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/09/01 12:02:55 $
+$Date: 2014/09/02 13:40:56 $
 <!-- timestamp end -->
 </p>
 </div>