diff options
| author | Glenn Morris | 2014-08-27 18:59:29 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-08-27 18:59:29 -0700 |
| commit | 6d26235315194737c4dc8653cf6d05177a10fa9c (patch) | |
| tree | 4a80f49f2073d80610931dd8706e90527a98340b /admin | |
| parent | 93b31b57283d369fefc5c95082d7b09288f05128 (diff) | |
| parent | b62da77c1c94b393f8be7854ff1cb30b012aa238 (diff) | |
| download | emacs-6d26235315194737c4dc8653cf6d05177a10fa9c.tar.gz emacs-6d26235315194737c4dc8653cf6d05177a10fa9c.zip | |
Merge from emacs-24; up to 2014-07-02T00:57:53Z!juri@jurta.org
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/authors.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/authors.el b/admin/authors.el index cb8706bbf18..1682788f2e8 100644 --- a/admin/authors.el +++ b/admin/authors.el | |||
| @@ -92,6 +92,7 @@ files.") | |||
| 92 | ("Joseph Arceneaux" "Joe Arceneaux") | 92 | ("Joseph Arceneaux" "Joe Arceneaux") |
| 93 | ("Joseph M. Kelsey" "Joe Kelsey") ; FIXME ? | 93 | ("Joseph M. Kelsey" "Joe Kelsey") ; FIXME ? |
| 94 | ("Juan León Lahoz García" "Juan-Leon Lahoz Garcia") | 94 | ("Juan León Lahoz García" "Juan-Leon Lahoz Garcia") |
| 95 | ("Jürgen Hötzel" "Juergen Hoetzel") | ||
| 95 | ("K. Shane Hartman" "Shane Hartman") | 96 | ("K. Shane Hartman" "Shane Hartman") |
| 96 | ("Kai Großjohann" "Kai Grossjohann") | 97 | ("Kai Großjohann" "Kai Grossjohann") |
| 97 | ("Karl Berry" "K. Berry") | 98 | ("Karl Berry" "K. Berry") |