Mercurial > pidgin
diff COPYRIGHT @ 30279:29e714e980b2
merge of 'c32c1fdff08db87b69fc0eb921a5eaafcb5ef67e'
and 'fcd99a6bb8c6362d64f295a1b95a5b1130460b85'
author | andrew.victor@mxit.com |
---|---|
date | Fri, 28 May 2010 21:10:09 +0000 |
parents | a4527d9ee853 |
children | 91869ed3ba59 |
line wrap: on
line diff
--- a/COPYRIGHT Fri May 28 21:08:49 2010 +0000 +++ b/COPYRIGHT Fri May 28 21:10:09 2010 +0000 @@ -123,6 +123,7 @@ Josh Davis Martijn Dekker Florian Delizy +Jiri Denemark Vinicius Depizzol Philip Derrin Taso N. Devetzis @@ -481,6 +482,7 @@ Marcus Sundberg Mårten Svantesson (fursten) Amir Szekely (kichik) +Gábor Szuromi (kukkerman) Robert T. Greg Taeger Rob Taft