summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorVivien Bernet-Rollande <scrouaf@soc.pidgin.im>2008-08-13 21:46:17 +0000
committerVivien Bernet-Rollande <scrouaf@soc.pidgin.im>2008-08-13 21:46:17 +0000
commit834767cdef88f442f050a132d0beee76d206afa3 (patch)
tree673ca34d2049142c9119dc1bc2c5e831e8f2495f /COPYRIGHT
parent85546bf6b43202f527b23721f704ba719fea82da (diff)
parent902bfee5d10b626de950a76ea2aafb33e871ff68 (diff)
downloadpidgin-834767cdef88f442f050a132d0beee76d206afa3.tar.gz
propagate from branch 'im.pidgin.pidgin' (head a9f4343f9aad8830875ced7e6469f1fec95a3542)
to branch 'im.pidgin.soc.2008.masterpassword' (head 9beebdbf44d6fa37e0fb6b25511cbe755bd79b58)
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT1
1 files changed, 1 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index d71546c74c..33d57074d6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -30,6 +30,7 @@ Curtis Beattie
Dave Bell
Igor Belyi
Brian Bernas
+Vivien Bernet-Rollande
Paul Betts
Jonas Birmé
George-Cristian Bîrzan