Mercurial > pidgin
changeset 29450:2a3c7e119700
merge of '482ed999a24c66c1632c1a616870caf1dd7577a8'
and '6a9b8f39a0b939272e8e52e469a6361b5fece2d0'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Tue, 25 Nov 2008 18:24:45 +0000 |
parents | c203ceb5bd9a (current diff) 1f5ba7d5465d (diff) |
children | 9a5d98ddca8d |
files | |
diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Tue Nov 25 17:24:40 2008 +0000 +++ b/COPYRIGHT Tue Nov 25 18:24:45 2008 +0000 @@ -201,12 +201,14 @@ Instant Messaging Freedom, Inc. Vitaliy Ischenko Intel Corporation +Andrew Ivanov Scott Jackson Hans Petter Jansson Henry Jen Benjamin Kahn Anders Kaseorg Praveen Karadakal +Tomáš Kebert John Kelm Jochen Kemnade Akuke Kok @@ -477,6 +479,7 @@ Ma Xuan Jared Yanovich Timmy Yee +Yuriy Yevgrafov Nickolai Zeldovich Tom Zickel Marco Ziech