Mercurial > pidgin
diff COPYRIGHT @ 21563:1b174854bb80
merge of '30fcf2f336afb635b62a5c3ed3adb3e1fa1dd2d1'
and 'bb60447c0a8c79afca320f4dc689096f4788e7fa'
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Sat, 17 Nov 2007 01:55:21 +0000 |
parents | 38cc722159ff |
children | 28c63fdcda73 |
line wrap: on
line diff
--- a/COPYRIGHT Wed Nov 14 03:15:32 2007 +0000 +++ b/COPYRIGHT Sat Nov 17 01:55:21 2007 +0000 @@ -80,6 +80,7 @@ Graham Cole Jono Cole Lorenzo Colitti +Collabora Ltd. Jeff Connelly Nathan Conrad Felipe Contreras @@ -92,6 +93,7 @@ Michael Culbertson Steven Danna Chris Davies +Josh Davis Martijn Dekker Vinicius Depizzol Philip Derrin @@ -196,6 +198,7 @@ Akuke Kok Konstantin Korikov Cole Kowalski +Matt Kramer Gary Kramlich Jan Kratochvil Andrej Krivulčík @@ -267,6 +270,7 @@ Ruediger Oertel Gudmundur Bjarni Olafsson Bartosz Oler +Stefan Ott Shawn Outman Nathan Owens (pianocomp81) John Oyler