summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorEric Polino <aluink@pidgin.im>2007-07-05 02:41:26 +0000
committerEric Polino <aluink@pidgin.im>2007-07-05 02:41:26 +0000
commit93a1da6b2ed1d75b36e327ee9b65fc3a0c884ac5 (patch)
tree4348a5f852d1f7ef1e04b80dadfa6cbb97b99ac9 /COPYRIGHT
parent0992d38e2a3f46e34658d19f32cd2940fb1e59b1 (diff)
parent161b0b1710c024bebdda709e411446f89aeb0ac9 (diff)
downloadpidgin-93a1da6b2ed1d75b36e327ee9b65fc3a0c884ac5.tar.gz
propagate from branch 'im.pidgin.pidgin' (head 55d7e067a3ca1926d5a5071745af8e44d8a12feb)
to branch 'im.pidgin.soc.2007.finchfeat' (head 9d1e67686dfb4a5e1c68805153522b03e98af7fe)
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT1
1 files changed, 1 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index e15bc6cc80..a3de306fae 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -325,6 +325,7 @@ Jim Seymour
Joe Shaw
Scott Shedden
Dossy Shiobara
+Michael Shkutkov
Ettore Simone
John Silvestri
Craig Slusher