# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1210658650 0
# Node ID d476ab1b47b21b3ebdfd5cf7c64ffde65bf1e78e
# Parent  59cfa621091062bea9b867345da06399eb54d6a0# Parent  da1b9eeac7b59b99289979ef13041eaecb9a6ab1
propagate from branch 'im.pidgin.pidgin.custom_smiley' (head 2a2aa2b4e4f34248a96a684b2e29963c358c1338)
            to branch 'im.pidgin.pidgin.next.minor' (head 485ba8630d52b894d8ec9648d6fe2ccb9754d1e8)

diff -r da1b9eeac7b5 -r d476ab1b47b2 COPYRIGHT
--- a/COPYRIGHT	Tue May 13 02:49:30 2008 +0000
+++ b/COPYRIGHT	Tue May 13 06:04:10 2008 +0000
@@ -231,6 +231,7 @@
 Shlomi Loubaton
 Uli Luckas
 Matthew Luckie
+Marcus Lundblad
 Mike Lundy
 Jason Lynch
 Iain MacDonnell