From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 4 Apr 2015 21:59:06 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=389698e53a4d3130035e46bf7f8b28480ae9ed8a;p=emacs.git

Merge from origin/emacs-24

The following commit was skipped:

0ad5fe0 * etc/AUTHORS: Update the AUTHORS file
---

389698e53a4d3130035e46bf7f8b28480ae9ed8a