diff COPYRIGHT @ 26020:8bfa1f01f035

merge of 'a4aa548f12b557cc419b1567e6902eb124d0cf06' and 'c2b27ebb3760df28827d2fd1b391386a894cf952'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sun, 19 Oct 2008 04:40:59 +0000
parents 0006181485ea
children 03c73e917b1b
line wrap: on
line diff
--- a/COPYRIGHT	Sun Oct 19 04:37:23 2008 +0000
+++ b/COPYRIGHT	Sun Oct 19 04:40:59 2008 +0000
@@ -320,6 +320,7 @@
 Jory A. Pratt
 Brent Priddy
 Justin Pryzby
+Florian Quèze
 Ignacio Casal Quinteiro
 Federicco Mena Quintero
 Yosef Radchenko
@@ -354,6 +355,7 @@
 Andrew Sayman
 Alceste Scalas
 Carsten Schaar
+Toby Schaffer
 Jonathan Schleifer <js-pidgin@webkeks.org>
 Matteo Settenvini
 Colin Seymour
@@ -423,6 +425,7 @@
 Gal Topper
 Chris Toshok
 Ken Tossell
+Marcus Trautwig
 Tom Tromey
 Todd Troxell
 Brad Turcotte