summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorJames Geboski <jgeboski@gmail.com>2015-10-17 20:41:26 -0400
committerJames Geboski <jgeboski@gmail.com>2015-10-17 20:41:26 -0400
commit610c4cab916fb9e27e44c0db325d9892ab5c1921 (patch)
treef2f725a278496d6aed2989fbd591674bc3a72284 /COPYRIGHT
parentd4b72fee49e9b773adfa83311c01515a962de75f (diff)
parent914eb216a5ed4c6de1aac76fd348a6f36cf6ef04 (diff)
downloadpidgin-610c4cab916fb9e27e44c0db325d9892ab5c1921.tar.gz
Merge default into facebook
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT2
1 files changed, 2 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 2f5ed77e3e..3581f4a35c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -22,6 +22,7 @@ Saleem Abdulrasool
Jakub Adam
Dave Ahlswede
Haval A. Ahmed
+Sorokin Alexei
Thijs Alkemade
Manuel Amador
Matt Amato
@@ -487,6 +488,7 @@ Carsten Schaar
Toby Schaffer
Jonathan Schleifer <js-pidgin@webkeks.org>
Luke Schierer
+Sebastian Schmidt <yath@yath.de>
Ralph Schmieder
David Schmitt
Heiko Schmitt