diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-29 14:14:19 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-29 14:14:19 -0700 |
| commit | eacb6b4bfa897c12c41a4af73f40ab61b45a8548 (patch) | |
| tree | d0f9e055b6780b64db72c65753a793e1d1a59f66 /admin | |
| parent | 5402029425ceee114d7ed071ac981227f0d1fc38 (diff) | |
| parent | 096a60526593c1571da1ec9137b878ad8178f833 (diff) | |
| download | emacs-eacb6b4bfa897c12c41a4af73f40ab61b45a8548.tar.gz | |
Merge from trunk.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 1d988a25626..e4a04763061 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -79,6 +79,11 @@ Michael Olson doc/misc/erc.texi lisp/emacs-lisp/tq.el +Bastien Guerry + Org + lisp/org/* + doc/misc/org.texi + ============================================================================== 2. ============================================================================== |