summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorElliott Sales de Andrade <qulogic@pidgin.im>2012-05-25 19:41:52 +0000
committerElliott Sales de Andrade <qulogic@pidgin.im>2012-05-25 19:41:52 +0000
commitd6c152dfddf2fd9849965e986c8ce30f3ce57a98 (patch)
tree4175b9124464facb9c4475c9a6000def76d10817 /COPYRIGHT
parentd83d49b95478252c536457b128ae306fda92ca38 (diff)
parent3a538090ed683fe3313fd5766ef6ff8dd7e71c68 (diff)
downloadpidgin-d6c152dfddf2fd9849965e986c8ce30f3ce57a98.tar.gz
propagate from branch 'im.pidgin.pidgin' (head cdf1e8c4203ce3c777bbcf9e2ca07518411c4ee3)
to branch 'im.pidgin.soc.2008.masterpassword' (head d70a2403346e5af647067c78f2d254643a7c2f46)
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT2
1 files changed, 2 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 40d4110405..9a7e55ea97 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -24,6 +24,7 @@ Thijs Alkemade
Manuel Amador
Matt Amato
Josef Andrysek
+Flavius Anton
Geoffrey Antos
Daniel Atallah
Paul Aurich
@@ -130,6 +131,7 @@ Glauber de Oliveira Costa
Adam Cowell
Palmer Cox
Jeramey Crawford
+Olivier Crete
Michael Culbertson
Steven Danna
Simon Danner