summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorTomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>2013-05-12 12:47:11 +0200
committerTomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>2013-05-12 12:47:11 +0200
commitf1807cbcc85d7f36913597e31a8a741c7e37d0c2 (patch)
tree5785817f8defdb4811bb29bf32daed1a8572f1d4 /COPYRIGHT
parent4648204ff4dbfdfddc484b498d555bff47706958 (diff)
parentebf1e6224ab011641cd63f1161c2592aa2b10a90 (diff)
downloadpidgin-f1807cbcc85d7f36913597e31a8a741c7e37d0c2.tar.gz
Merge with main
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT1
1 files changed, 1 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 2748c8aeb3..da9bcdad32 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -55,6 +55,7 @@ Matthew W.S. Bell
Igor Belyi
David Benjamin
Brian Bernas
+Vivien Bernet-Rollande
Paul Betts
Runa Bhattacharjee
Jonas Birmé