propagate from branch 'im.pidgin.pidgin' (head 32da7ab6d1092d199f3c54e43644fb6303f82bd2)

            to branch 'im.pidgin.soc.2008.masterpassword' (head e0ce5fb11bdba2ac134e9675ce4dffd3f43e0418)

1 files changed, 48 insertions, 5 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 922c13165a..4faa39f0a8 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,22 +1,38 @@
 Pidgin, Finch, and libpurple
-Copyright (C) 1998-2008 by the following:
 
-If you have contributed to this project then you deserve to be on this
-list.  Contact us (see: AUTHORS) and we'll add you.
+This file is intended to be a comprehensive list of contributors to
+this project.  If you have contributed to this project then you deserve
+to be on this list.  Contact us (see: AUTHORS) and we'll add you.
+
+Many open source projects list contributor names at the top of each
+source file containing their contribution.  However, we've found
+that it is difficult to keep this list accurate, especially when old
+code is removed or existing code is moved to a different file.  So
+instead we chose to list a generic message at the top of each source
+file that points here.
+
+If concerns are raised as to the copyright holder of a particular
+piece of code, then that code should be traced through our version
+control system to see from where it came and who has modified it.
+
+Copyright (C) 1998-2009 by the following:
 
 Saleem Abdulrasool
 Dave Ahlswede
 Manuel Amador
 Matt Amato
+Josef Andrysek
 Geoffrey Antos
 Daniel Atallah
 Paul Aurich
 Patrick Aussems
 Anibal Avelar
 Ali Albazaz
+Kosta Arvanitis
 Christopher Ayoup
 Alex Badea
 John Bailey
+Arunan Balasubramaniam
 R. Tyler Ballance
 Chris Banal
 Luca Barbato
@@ -27,6 +43,8 @@ Lukas Barth
 Derek Battams
 Martin Bayard
 Curtis Beattie
+Stefan Becker
+Carlos Bederian
 Dave Bell
 Igor Belyi
 Brian Bernas
@@ -57,6 +75,7 @@ Jeffery Brown
 Philip Brown
 Dan Bruce
 Norbert Buchmuller
+Johannes Buchner
 Sean Burke
 Thomas Butter
 Trevor Caira
@@ -67,8 +86,10 @@ Keegan Carruthers-Smith
 Ludovico Cavedon
 Steve Cavilia
 Julien Cegarra
+Matěj Cepl
 Cerulean Studios, LLC
 Jonathan Champ
+Matthew Chapman
 Christophe Chapuis
 Patrick Cheung
 Ka-Hing Cheung
@@ -86,6 +107,7 @@ Jono Cole
 Lorenzo Colitti
 Collabora Ltd.
 Jeff Connelly
+Chris Connett
 Nathan Conrad
 Felipe Contreras
 Alex Converse
@@ -142,6 +164,7 @@ Francesco Fracassi
 Adam Fritzler
 Takao Fujiwara
 Max G.
+Martin von Gagern
 François Gagné
 Andrew Gaul
 Evgueni V. Gavrilov
@@ -163,6 +186,7 @@ David Grohmann
 Christian Grothoff
 Vladislav Guberinić
 Gideon N. Guillen
+Aman Gupta
 Christian Hammond
 Erick Hamness
 Fred Hampton
@@ -205,14 +229,22 @@ Vitaliy Ischenko
 Intel Corporation
 Scott Jackson
 Hans Petter Jansson
+David Jedelsky
 Henry Jen
 Benjamin Kahn
+Jan Kaluza
+Yuriy Kaminskiy
 Anders Kaseorg
 Praveen Karadakal
 Jaromír Karmazín
 John Kelm
 Jochen Kemnade
+Yann Kerherve
+Gordian Klein
+Krzysztof Klinikowski
 Akuke Kok
+Kir Kolyshkin
+F.W. Kong
 Konstantin Korikov
 Cole Kowalski
 Matt Kramer
@@ -253,7 +285,9 @@ Iain MacDonnell
 Lucio Maciel
 Brian Macke
 Paolo Maggi
+Sulabh Mahajan
 Willian T. Mahan
+Tobias Markmann
 Kris Marsh
 Fidel Martinez
 Lalo Martins
@@ -313,17 +347,19 @@ Havoc Pennington
 Ted Percival
 Eduardo Pérez
 Matt Perry
+Luke Petre
 Diego Petten
 Nathan Peterson
+Dmitry Petroff
 Sebastián E. Peyrott
+Andrea Piccinelli
 Celso Pinto
 Joao Luís Marques Pinto
 Aleksander Piotrowski
 Julien Pivotto
+Robey Pointer
 Eric Polino <aluink@gmail.com>
 Ari Pollak
-Robey Pointer
-Eric Polino
 Stephen Pope
 Nathan Poznick
 Jory A. Pratt
@@ -408,6 +444,7 @@ Peter Speybrouck
 Lex Spoon
 Chris Stafford
 Kevin Stange
+Joshua Stein
 Jakub Steiner
 Richard Stellingwerff
 Charlie Stockman
@@ -416,10 +453,12 @@ Adam Strzelecki
 Andreas Stührk
 Oleg Sukhodolsky
 Sun Microsystems
+Marcus Sundberg
 Mårten Svantesson (fursten)
 Amir Szekely (kichik)
 Robert T.
 Greg Taeger
+Rob Taft
 Peter Tang
 Brian Tarricone
 Peter Teichman
@@ -432,6 +471,7 @@ Douglas Thrift (douglaswth)
 Mark Tiefenbruck
 Andrew Tinney
 Jeffery To
+Krzysztof Tobola (kreez)
 Warren Togami
 Stu Tomlinson
 Bill Tompkins
@@ -443,6 +483,7 @@ Tom Tromey
 Todd Troxell
 Brad Turcotte
 Kyle Turman
+Jon Turney
 Junichi Uekawa
 Igor Vlasenko
 István Váradi
@@ -479,6 +520,7 @@ Matt Wilson
 Dan Winship
 Michal Witkowski
 Scott Wolchok
+Rogier Wolff
 The Written Word, Inc.
 Kevin Wu Won
 Pui Lam Wong
@@ -487,6 +529,7 @@ Ximian
 Ma Xuan
 Jared Yanovich
 Timmy Yee
+Li Yuan
 Nickolai Zeldovich
 Tom Zickel
 Marco Ziech