diff options
| author | Paul Eggert | 2011-07-28 22:31:12 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-28 22:31:12 -0700 |
| commit | 18ab493650d648ab8dca651ea2698861f926e895 (patch) | |
| tree | b16ca478db1e96af8d0be9a20ff1361bea6d12ee /admin | |
| parent | 726e0ab18e84ce0df6b9dc1612bf4d92b9d1e52a (diff) | |
| parent | 43dc9f5b0187276c24e1f63f2a23ba4b81c20e07 (diff) | |
| download | emacs-18ab493650d648ab8dca651ea2698861f926e895.tar.gz emacs-18ab493650d648ab8dca651ea2698861f926e895.zip | |
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 | |||
| 79 | doc/misc/erc.texi | 79 | doc/misc/erc.texi |
| 80 | lisp/emacs-lisp/tq.el | 80 | lisp/emacs-lisp/tq.el |
| 81 | 81 | ||
| 82 | Bastien Guerry | ||
| 83 | Org | ||
| 84 | lisp/org/* | ||
| 85 | doc/misc/org.texi | ||
| 86 | |||
| 82 | ============================================================================== | 87 | ============================================================================== |
| 83 | 2. | 88 | 2. |
| 84 | ============================================================================== | 89 | ============================================================================== |