diff COPYRIGHT @ 20400:ea9a5566a156

propagate from branch 'im.pidgin.rlaager.merging.msnp13-and-sf-1621854-4' (head 36b8a3e05397b5918f311a046fa580c5bb8846e0) to branch 'im.pidgin.cpw.khc.msnp14' (head 39ac2e1b7754245b292605b0e3055ebb1b954c5d)

--- a/COPYRIGHT	Sun Apr 15 04:46:02 2007 +0000
+++ b/COPYRIGHT	Sun Apr 15 05:00:56 2007 +0000
@@ -1,8 +1,8 @@
-Gaim
-Copyright (C) 1998-2006 by the following:
+Purple, Pidgin and Finch
+Copyright (C) 1998-2007 by the following:
 
-If you have contributed to Gaim, you deserve to be on this list.
-Contact us (see: AUTHORS) and we'll add you.
+If you have contributed to this project then you deserve to be on this
+list.  Contact us (see: AUTHORS) and we'll add you.
 
 Saleem Abdulrasool
 Dave Ahlswede
@@ -97,6 +97,8 @@
 Andrew Echols
 John Eckerdal
 Sean Egan <[e-mail]>
+William Ehlhardt
+Markus Elfring
 Nelson Elhage
 Ignacio J. Elia
 Brian Enigma
@@ -104,6 +106,7 @@
 Stefan Esser
 Steffen Eschenbacher
 Marc Etcheverry
+David Everly
 Larry Ewing
 Gábor Farkas
 Jesse Farmer
@@ -159,6 +162,7 @@
 Kevin Hunter
 Rian Hunter
 Thomas Huriaux
+Instant Messaging Freedom, Inc.
 Vitaliy Ischenko
 Scott Jackson
 Hans Petter Jansson
@@ -194,6 +198,7 @@
 Syd Logan
 Lokheed
 Norberto Lopes
+Shlomi Loubaton
 Uli Luckas
 Matthew Luckie
 Mike Lundy
@@ -243,6 +248,7 @@
 Havoc Pennington
 Ted Percival
 Eduardo Pérez
+Matt Perry
 Celso Pinto
 Joao Luís Marques Pinto
 Aleksander Piotrowski
@@ -294,6 +300,7 @@
 Jim Seymour
 Joe Shaw
 Scott Shedden
+Dossy Shiobara
 Ettore Simone
 John Silvestri
 Craig Slusher
@@ -314,6 +321,8 @@
 Sun Microsystems
 Mårten Svantesson (fursten)
 Robert T.
+Greg Taeger
+Peter Tang
 Brian Tarricone
 Peter Teichman
 Philip Tellis
@@ -351,6 +360,7 @@
 Andrew Wellington
 Adam Wendt
 Dave West
+Zac West
 Daniel Westermann-Clark
 Andrew Whewell
 Simon Wilkinson