From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Sat, 27 Dec 2014 16:27:15 +0000 (-0300)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2631^2~15^2~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f315b69922db769f3358e15616aa76c965be8a89;p=emacs.git

Merge from origin/emacs-24

The following commit was skipped:

5fc8210 Backport: Memory leak fix and 19133 fix.
---

f315b69922db769f3358e15616aa76c965be8a89