From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 5 Dec 2014 20:12:00 +0000 (-0500)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2635^2~190
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/0c3f76c6335de0a2d44db37c9ddf953654ca7f32

Merge from origin/emacs-24

The following commit was skipped:

babb0ca ChangeLog fix (do not merge to master)
---

0c3f76c6335de0a2d44db37c9ddf953654ca7f32