diff COPYRIGHT @ 21341:789ed158a50a

explicit merge of '2762c6075c0dc52a96098c5478c5bf68cfd890a3' and '6f090c623ea4e9357e5b4238348a888b4c869ab7'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 22:38:00 +0000
parents 680e1319b464 975691a8d718
children f869796bf505 e747ac0c42d6
line wrap: on
line diff
--- a/COPYRIGHT	Sat Oct 13 21:55:41 2007 +0000
+++ b/COPYRIGHT	Fri Nov 16 22:38:00 2007 +0000
@@ -268,6 +268,7 @@
 Ruediger Oertel
 Gudmundur Bjarni Olafsson
 Bartosz Oler
+Stefan Ott
 Shawn Outman
 Nathan Owens (pianocomp81)
 John Oyler