Mercurial > pidgin
diff COPYRIGHT @ 31040:1029e81fe8e5
merge of '0c09db333f3ff80093510065d37e0e275499b9f1'
and '2b77d04bbc598fa43216d1cfbc953a5891d1eda1'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Thu, 16 Dec 2010 07:20:13 +0000 |
parents | 36855fcbd278 |
children | 5977b469c286 |
line wrap: on
line diff
--- a/COPYRIGHT Thu Dec 16 02:49:59 2010 +0000 +++ b/COPYRIGHT Thu Dec 16 07:20:13 2010 +0000 @@ -20,6 +20,7 @@ Saleem Abdulrasool Jakub Adam Dave Ahlswede +Thijs Alkemade Manuel Amador Matt Amato Josef Andrysek @@ -489,6 +490,7 @@ Mårten Svantesson (fursten) Amir Szekely (kichik) Gábor Szuromi (kukkerman) +Jakub Szypulka Robert T. Greg Taeger Rob Taft