summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorElliott Sales de Andrade <qulogic@pidgin.im>2012-03-26 20:37:30 +0000
committerElliott Sales de Andrade <qulogic@pidgin.im>2012-03-26 20:37:30 +0000
commitd83d49b95478252c536457b128ae306fda92ca38 (patch)
treefe6ede967f8edf7f40341941904cc4a5336e6745 /COPYRIGHT
parent14ac8445d7cbf0fafda18e7e33c8bc5faa241e32 (diff)
parent7231e7d344e8a90e66da63ce0a3adacfb7fa98e7 (diff)
downloadpidgin-d83d49b95478252c536457b128ae306fda92ca38.tar.gz
propagate from branch 'im.pidgin.pidgin' (head ab1aca1df45bf5e702d85f8873c1ee61c637a440)
to branch 'im.pidgin.soc.2008.masterpassword' (head 9c3c6a1381356f09cbf155063f785abaa3d2ad50)
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT1
1 files changed, 1 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index df76c15727..40d4110405 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -52,6 +52,7 @@ Matthew W.S. Bell
Igor Belyi
David Benjamin
Brian Bernas
+Vivien Bernet-Rollande
Paul Betts
Runa Bhattacharjee
Jonas Birmé