summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/authors.el
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2006-12-03 12:36:08 +0000
committerKaroly Lorentey <lorentey@elte.hu>2006-12-03 12:36:08 +0000
commitd0104e754a241cf83811fef30195d41201de533c (patch)
tree6a5a31760801bd70649d0f9b132f61c46fac8445 /lisp/emacs-lisp/authors.el
parent19739b34866e6a4789d842961470123b50158612 (diff)
parentab785936c82ac81edb8b20ac27c0558bc04797e5 (diff)
downloademacs-d0104e754a241cf83811fef30195d41201de533c.tar.gz
emacs-d0104e754a241cf83811fef30195d41201de533c.tar.bz2
emacs-d0104e754a241cf83811fef30195d41201de533c.zip
Merged from emacs@sv.gnu.org.
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-486 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-487 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-488 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-489 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/gnus--rel--5.10--patch-156 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-157 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-158 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-159 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-160 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-587
Diffstat (limited to 'lisp/emacs-lisp/authors.el')
-rw-r--r--lisp/emacs-lisp/authors.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index d1710dba7a4..db8c3d5d21a 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -105,6 +105,7 @@ files.")
("Matt Swift" "Matthew Swift")
("Michael R. Mauger" "Michael Mauger")
("Michael D. Ernst" "Michael Ernst")
+ ("Micha,Ak(Bl Cadilhac" "Michael Cadilhac")
("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, P/Bsg")
("Mikio Nakajima" "Nakajima Mikio")
("Paul Eggert" "eggert")