[Emacs-diffs] master updated (7d6a6b4 -> e6b1df0)

[Paul Eggert]

eggert pushed a change to branch master.

      from  7d6a6b4   Small improvement for noninteractive gitmerge
       new  c569e68   Update authors.el
       new  e6b1df0   * admin/authors.el (authors-aliases): Additions.


Summary of changes:
 admin/authors.el | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)