diff COPYRIGHT @ 22144:c85ee90ed861

merge of '43413f6662ecd55ea083fbbacb3f16c01843e655' and 'a00c23cb7c851de1701db02d50c4f35bdf540595'
author Mark Doliner <mark@kingant.net>
date Thu, 17 Jan 2008 08:10:50 +0000
parents 4ab154a14e55
children 9559469acd62
line wrap: on
line diff
--- a/COPYRIGHT	Thu Jan 17 08:01:02 2008 +0000
+++ b/COPYRIGHT	Thu Jan 17 08:10:50 2008 +0000
@@ -270,6 +270,7 @@
 Padraig O'Briain
 Christopher O'Brien (siege)
 Jon Oberheide
+Yusuke Odate
 Ruediger Oertel
 Gudmundur Bjarni Olafsson
 Bartosz Oler
@@ -427,6 +428,7 @@
 Andrew Whewell
 Simon Wilkinson
 Dan Willemsen
+Justin Williams (Jaywalker)
 Jason Willis
 Matt Wilson
 Dan Winship