From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Sat, 27 Dec 2014 16:17:18 +0000 (-0300)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2631^2~15^2~18
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/c3c51ec274f423cf8044cd5b9bc0bbc5bda1f6aa

Merge from origin/emacs-24

The following commit was skipped:

48a9d9f Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24
---

c3c51ec274f423cf8044cd5b9bc0bbc5bda1f6aa