diff COPYRIGHT @ 19120:b25cb0775be3

explicit merge of 'e53fe113efde971f9f1d14d8a7af937542ee2732' and 'fac895a331d8ffa475b42a0eaf193587799661b9'
author Eric Polino <aluink@pidgin.im>
date Thu, 28 Jun 2007 03:09:03 +0000
parents ab1696204721 ac904659104f
children c6282dc3fb9f
line wrap: on
line diff
--- a/COPYRIGHT	Wed Jun 27 19:31:39 2007 +0000
+++ b/COPYRIGHT	Thu Jun 28 03:09:03 2007 +0000
@@ -274,6 +274,7 @@
 Joao Luís Marques Pinto
 Aleksander Piotrowski
 Julien Pivotto
+Eric Polino <aluink@gmail.com>
 Ari Pollak
 Robey Pointer
 Eric Polino