diff COPYRIGHT @ 30061:4463cd2aba2d

merge of 'b5086a027dfbc0926b74627b9783794d250c2cb4' and 'ea400018f9483ac602c6fa1e16d8c94e37a655b2'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 14 May 2010 06:57:26 +0000
parents 3f6daa187665 cd857e9b7281
children 1efb52ff7ad0
line wrap: on
line diff
--- a/COPYRIGHT	Tue May 11 06:32:00 2010 +0000
+++ b/COPYRIGHT	Fri May 14 06:57:26 2010 +0000
@@ -118,6 +118,7 @@
 Jeramey Crawford
 Michael Culbertson
 Steven Danna
+Simon Danner
 Chris Davies
 Josh Davis
 Martijn Dekker