From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 3 Mar 2015 22:23:24 +0000 (-0800)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~243
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=118a31a3b1eb08cba14887c3134054e9b4383688;p=emacs.git

Merge from origin/emacs-24

The following commits were skipped:

43b82ba authors.el: backport some additions
9e22ff0 # ChangeLog fixes, backported
---

118a31a3b1eb08cba14887c3134054e9b4383688