diff AUTHORS @ 24173:60c23887a665

propagate from branch 'im.pidgin.pidgin' (head b14102a6c681b35084d2c3f7726de34d4f859fe1) to branch 'im.pidgin.xmpp.custom_smiley' (head 8b901ad4ba6c969957644156f9786ec84de1897c)
author Marcus Lundblad <ml@update.uu.se>
date Sat, 13 Sep 2008 16:13:48 +0000
parents de712dc6fecd
children d6c2d6c9fd2a
line wrap: on
line diff
--- a/AUTHORS	Thu Sep 11 19:12:39 2008 +0000
+++ b/AUTHORS	Sat Sep 13 16:13:48 2008 +0000
@@ -36,6 +36,7 @@
 Crazy Patch Writers:
 -------------------
 Felipe 'shx' Contreras
+Marcus 'malu' Lundblad
 Dennis 'EvilDennisR' Ristuccia
 Peter 'Fmoo' Ruibal
 Gabriel 'Nix' Schulhof