summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorJan Dubois <jand@activestate.com>2010-12-02 16:18:18 -0800
committerJan Dubois <jand@activestate.com>2010-12-02 16:18:18 -0800
commit5fd12bc01d71da15269c0366d7335a63d6fc749e (patch)
tree1c4160399679b99af1e904e005e4c912f39b95f8 /AUTHORS
parentff6cadee5ae4dcfad131d8f2abcd2719dc521593 (diff)
parent8cbe99e5b6fe99a6bc17c0b0cee249bac3565da4 (diff)
downloadperl-5fd12bc01d71da15269c0366d7335a63d6fc749e.tar.gz
Merge branch 'blead' of ssh://perl5.git.perl.org/gitroot/perl into blead
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS3
1 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 97b0bd55da..3f2d69f88b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -627,7 +627,7 @@ Lincoln D. Stein <lstein@cshl.org>
Lionel Cons <lionel.cons@cern.ch>
Luc St-Louis <luc.st-louis@ca.transport.bombardier.com>
Luca Fini
-Lukas Mai
+Lukas Mai <l.mai@web.de>
Luke Closs <lukec@cpan.org>
Luke Ross <lukeross@gmail.com>
Lubomir Rintel <lkundrak@v3.sk>
@@ -716,6 +716,7 @@ Michael Cummings <mcummings@gentoo.org>
Michael De La Rue <mikedlr@tardis.ed.ac.uk>
Michael van Elst <mlelstv@serpens.de>
Michael Engel <engel@nms1.cc.huji.ac.il>
+Michael Fig <michael@liveblockauctions.com>
Michael G Schwern <schwern@pobox.com>
Michael H. Moran <mhm@austin.ibm.com>
Michael King <mike808@users.sourceforge.net>